From ff843840241db9676272771616fb5087a85a4f33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Fri, 6 Nov 2020 01:48:49 +0300
Subject: [PATCH 1/6] Search and filter first commit

---
 app/Http/Controllers/Common/BulkActions.php   |   4 +-
 app/View/Components/SearchString.php          |  82 +++
 config/search-string.php                      |   6 +-
 .../assets/js/components/AkauntingSearch.vue  | 587 +++++++++++++-----
 resources/lang/en-GB/general.php              |   2 +-
 .../views/auth/permissions/index.blade.php    |   5 +-
 resources/views/auth/roles/index.blade.php    |   5 +-
 resources/views/auth/users/index.blade.php    |   5 +-
 .../views/banking/accounts/index.blade.php    |   5 +-
 .../banking/reconciliations/index.blade.php   |   5 +-
 .../banking/transactions/index.blade.php      |   5 +-
 .../views/banking/transfers/index.blade.php   |   5 +-
 .../views/common/companies/index.blade.php    |   5 +-
 .../views/common/dashboards/index.blade.php   |   5 +-
 resources/views/common/items/index.blade.php  |   5 +-
 .../views/components/search-string.blade.php  |   7 +
 .../views/purchases/bills/index.blade.php     |   5 +-
 .../views/purchases/payments/index.blade.php  |   5 +-
 .../views/purchases/vendors/index.blade.php   |   5 +-
 .../views/sales/customers/index.blade.php     |   5 +-
 .../views/sales/invoices/index.blade.php      |   5 +-
 .../views/sales/revenues/index.blade.php      |   5 +-
 .../views/settings/categories/index.blade.php |   5 +-
 .../views/settings/currencies/index.blade.php |   5 +-
 .../views/settings/taxes/index.blade.php      |   5 +-
 25 files changed, 552 insertions(+), 231 deletions(-)
 create mode 100644 app/View/Components/SearchString.php
 create mode 100644 resources/views/components/search-string.blade.php

diff --git a/app/Http/Controllers/Common/BulkActions.php b/app/Http/Controllers/Common/BulkActions.php
index e84694553..ef43531a8 100644
--- a/app/Http/Controllers/Common/BulkActions.php
+++ b/app/Http/Controllers/Common/BulkActions.php
@@ -6,9 +6,7 @@ use App\Abstracts\Http\Controller;
 use App\Http\Requests\Common\BulkAction as Request;
 use Illuminate\Support\Str;
 
-class
-
-BulkActions extends Controller
+class BulkActions extends Controller
 {
 
     /**
diff --git a/app/View/Components/SearchString.php b/app/View/Components/SearchString.php
new file mode 100644
index 000000000..d7969ad06
--- /dev/null
+++ b/app/View/Components/SearchString.php
@@ -0,0 +1,82 @@
+<?php
+
+namespace App\View\Components;
+
+use Illuminate\View\Component;
+use Illuminate\Support\Str;
+
+class SearchString extends Component
+{
+    public $filters;
+
+    public $model;
+
+    /**
+     * Create a new component instance.
+     *
+     * @return void
+     */
+    public function __construct($model)
+    {
+        $this->model = $model;
+    }
+
+    /**
+     * Get the view / contents that represent the component.
+     *
+     * @return \Illuminate\Contracts\View\View|string
+     */
+    public function render()
+    {
+        $searc_string = config('search-string');
+
+        $this->filters = false;
+
+        if (!empty($searc_string[$this->model])) {
+            $columns = $searc_string[$this->model]['columns'];
+
+            foreach ($columns as $column => $options) {
+                if (!empty($options['searchable'])) {
+                    continue;
+                }
+    
+                if (!is_array($options)) {
+                    $column = $options;
+                }
+
+                $name = $this->getFilterName($column);
+    
+                $this->filters[] = [
+                    'key' => $column,
+                    'value' => $name,
+                    'url' => !empty($options['route']) ? route($options['route'][0], $options['route'][1]) : ''
+                ];
+            }
+        }
+
+        return view('components.search-string');
+    }
+
+    protected function getFilterName($column)
+    {
+        if (strpos($column, '_id') !== false) {
+            $column = str_replace('_id', '', $column);
+        }
+
+        $plural = Str::plural($column, 2);
+
+        if (trans_choice('general.' . $plural, 1) !== 'general.' . $plural) {
+            return trans_choice('general.' . $plural, 1);
+        } elseif (trans_choice('search_string.colmuns.' . $plural, 1) !== 'search_string.colmuns.' . $plural) {
+            return trans_choice('search_string.colmuns.' . $plural, 1);
+        }
+
+        $name = trans('general.' . $column);
+    
+        if ($name == 'general.' . $column) {
+            $name = trans('search_string.colmuns.' . $column);
+        }
+
+        return $name;
+    }
+}
diff --git a/config/search-string.php b/config/search-string.php
index 355e1a988..cf316c474 100644
--- a/config/search-string.php
+++ b/config/search-string.php
@@ -120,9 +120,9 @@ return [
             'name' => ['searchable' => true],
             'description' => ['searchable' => true],
             'enabled' => ['boolean' => true],
-            'category_id' => ['key' => 'category_id'],
-            'sale_price',
-            'purchase_price',
+            'category_id' => [
+                'route' => ['categories.index', 'search=type:item']
+            ],
         ],
     ],
 
diff --git a/resources/assets/js/components/AkauntingSearch.vue b/resources/assets/js/components/AkauntingSearch.vue
index 639849c4a..238c34490 100644
--- a/resources/assets/js/components/AkauntingSearch.vue
+++ b/resources/assets/js/components/AkauntingSearch.vue
@@ -1,175 +1,466 @@
 <template>
+  <div :id="'search-field-' + _uid" class="searh-field tags-input__wrapper">
+    <div class="tags-group" v-for="(filter, index) in filtered" :index="index">
+      <span v-if="filter.option" class="el-tag el-tag--primary el-tag--small el-tag--light el-tag-option">
+        {{ filter.option }}
+      </span>
 
-    <el-select
-        :class="'pl-20 mr-40'"
-        v-model="real_model"
-        @input="change"
-        filterable
-        remote
-        reserve-keyword
+      <span v-if="filter.operator" class="el-tag el-tag--primary el-tag--small el-tag--light el-tag-operator">
+        {{ filter.operator }}
+      </span>
+
+      <span v-if="filter.value" class="el-tag el-tag--primary el-tag--small el-tag--light el-tag-value">
+        {{ filter.value }}
+        <i class="el-tag__close el-icon-close" @click="onFilterDelete(index)"></i>
+      </span>
+    </div>
+
+    <div class="dropdown input-full">
+      <input
+        type="text"
+        class="form-control"
         :placeholder="placeholder"
-        :remote-method="remoteMethod"
-        :loading="loading">
-        <div v-if="loading" class="el-select-dropdown__wrap" slot="empty">
-            <p class="el-select-dropdown__empty loading">
-                {{ loadingText }}
-            </p>
-        </div>
+        :ref="'input-search-field-' + _uid"
+        v-model="search"
+        @focus="onInputFocus"
+        @input="onInput"
+        @keyup.enter="onInputConfirm"
+      />
 
-        <div v-else-if="options.length != 0" class="el-select-dropdown__wrap" slot="empty">
-            <p class="el-select-dropdown__empty">
-                {{ noMatchingDataText }}
-            </p>
-        </div>
+      <button type="button" class="btn btn-link clear" @click="onSearchAndFilterClear">
+        <i class="el-tag__close el-icon-close"></i>
+      </button>
 
-        <div v-else-if="options.length == 0" slot="empty">
-            <p class="el-select-dropdown__empty">
-                {{ noDataText }}
-            </p>
-        </div>
+      <div class="dropdown-menu" :class="[{'show': visible.options}]">
+        <li ref="" class="dropdown-item" v-for="option in filteredOptions" :data-value="option.key">
+          <button type="button" class="btn btn-link" @click="onOptionSelected(option.key)">{{ option.value }}</button>
+        </li>
+        <li ref="" v-if="search" class="dropdown-item">
+          <button type="button" class="btn btn-link" @click="onInputConfirm">{{ textSearch }}</button>
+        </li>
+      </div>
 
-        <template v-if="icon" slot="prefix">
-            <span class="el-input__suffix-inner el-select-icon">
-                <i :class="'select-icon-position el-input__icon fa fa-' + icon"></i>
-            </span>
-        </template>
-
-        <el-option v-if="!group" v-for="option in selectOptions"
-            :key="option.id"
-            :label="option.name"
-            :value="option.id">
-        </el-option>
-
-        <el-option-group
-            v-if="group"
-            v-for="(options, name) in selectOptions"
-            :key="name"
-            :label="name">
-            <el-option
-                v-for="(label, value) in options"
-                :key="value"
-                :label="label"
-                :value="value">
-            </el-option>
-        </el-option-group>
-    </el-select>
+      <div class="dropdown-menu" :class="[{'show': visible.operator}]">
+        <li ref="" class="dropdown-item">
+          <button type="button" class="btn btn-link" @click="onOperatorSelected('=')">=<span class="btn-helptext">is</span></button>
+        </li>
+        <li ref="" class="dropdown-item">
+          <button type="button" class="btn btn-link" @click="onOperatorSelected('!=')">!=<span class="btn-helptext">is not</span></button>
+        </li>
+      </div>
 
+      <div class="dropdown-menu" :class="[{'show': visible.values}]">
+        <li ref="" class="dropdown-item" v-for="(value) in filteredValues" :data-value="value.key">
+          <button type="button" class="btn btn-link" @click="onValueSelected(value.key)">{{ value.value }}</button>
+        </li>
+      </div>
+    </div>
+  </div>
 </template>
 
-<style>
-    .el-select {
-        display: inline;
-    }
-</style>
-
 <script>
-    import { Select, Option, OptionGroup } from 'element-ui';
+export default {
+  name: 'akaunting-search',
 
-    export default {
-        name: 'akaunting-select',
+  props: {
+    placeholder: {
+      type: String,
+      default: 'Search or filter results...',
+      description: 'Input placeholder'
+    },
+    textSearch: {
+      type: String,
+      default: 'Search for this text',
+      description: 'Input placeholder'
+    },
+    value: {
+      type: String,
+      default: null,
+      description: 'Search attribute value'
+    },
+    filters: {
+      type: Array,
+      default: () => [],
+      description: 'List of filters'
+    },
+  },
 
-        components: {
-            [Select.name]: Select,
-            [Option.name]: Option,
-            [OptionGroup.name]: OptionGroup,
-        },
+  model: {
+    prop: 'value',
+    event: 'change'
+  },
 
-        props: {
-            name: {
-                type: String,
-                default: null,
-                description: "Selectbox attribute name"
-            },
-            placeholder: {
-                type: String,
-                default: '',
-                description: "Selectbox input placeholder text"
-            },
-            options: null,
-            value: {
-                type: String,
-                default: null,
-                description: "Selectbox selected value"
-            },
+  data() {
+    return {
+      filter_list: this.filters, // set filters prop assing it.
+      search: '', // search cloumn model
+      filtered:[], // Show selected filters
+      filter_index: 0, // added filter count
+      filter_last_step: 'options', // last fitler step
+      visible: { // Which visible dropdown
+        options: false,
+        operator: false,
+        values: false,
+      },
 
-            icon: {
-                type: String,
-                description: "Prepend icon (left)"
-            },
+      option_values: [],
+      selected_options: [],
+      selected_values: [],
+      values: [],
+      current_value: null,
+    };
+  },
 
-            group:  {
-                type: Boolean,
-                default: false,
-                description: "Selectbox option group status"
-            },
+  methods: {
+    onInputFocus() {
+      this.visible[this.filter_last_step] = true;
 
-            loadingText: {
-                type: String,
-                default: 'Loading...',
-                description: "Selectbox loading message"
-            },
-            noDataText: {
-                type: String,
-                default: 'No Data',
-                description: "Selectbox empty options message"
-            },
-            noMatchingDataText: {
-                type: String,
-                default: 'No Matchign Data',
-                description: "Selectbox search option not found item message"
-            },
+      this.$nextTick(() => {
+        this.$refs['input-search-field-' + this._uid].focus();
+      });
+    },
 
-            remoteAction: {
-                type: String,
-                default: null,
-                description: "Selectbox remote action path"
-            },
-            remoteType: {
-                type: String,
-                default: 'invoice',
-                description: "Ger remote item type."
-            },
-        },
+    onInput(evt) {
+      this.search = evt.target.value;
 
-        data() {
-            return {
-                list: [],
-                selectOptions: this.options,
-                real_model: this.model,
-                loading: false,
-            }
-        },
+      this.$emit('input', evt.target.value);
+    },
 
-        mounted() {
-            this.real_model = this.value;
+    onInputConfirm() {
+      let args = '';
 
-            this.$emit('interface', this.real_model);
-        },
+      if (this.search) {
+        args += '?search=' + this.search;
+      }
 
-        methods: {
-            change() {
-                this.$emit('change', this.real_model);
-                this.$emit('interface', this.real_model);
+      this.filtered.forEach(function (filter, index) {
+        if (!args) {
+          args += '?search=';
+        }
 
-                this.selectOptions.forEach(item => {
-                    if (item.id == this.real_model) {
-                        this.$emit('label', item.name);
-                        this.$emit('option', item);
+        args += this.selected_options[index].key + ':' + this.selected_values[index].key;
+      }, this);
 
-                        return;
-                    }
-                });
-            },
-            remoteMethod() {
+      window.location = url + '/common/items' + args;
+    },
 
-            },
-        },
+    onOptionSelected(value) {
+      this.current_value = value;
 
-        watch: {
-            options: function (options) {
-                // update options
-                //this.selectOptions = options;
-            }
-        },
+      let option = false;
+      let option_url = url + '';
+
+      for (let i = 0; i < this.filter_list.length; i++) {
+        if (this.filter_list[i].key == value) {
+          option = this.filter_list[i].value;
+
+          if (typeof this.filter_list[i].url !== 'undefined' && this.filter_list[i].url) {
+            option_url = this.filter_list[i].url;
+          }
+
+          this.selected_options.push(this.filter_list[i]);
+          this.filter_list.splice(i, 1);
+          break;
+        }
+      }
+
+      // Set filtered select option
+      this.filtered.push({
+        option: option,
+        operator: false,
+        value: false
+      });
+
+      this.$emit('change', this.filtered);
+
+      this.search = '';
+
+      if (!this.option_values[value]) {
+        window.axios.get(option_url)
+        .then(response => {
+            let data = response.data.data;
+
+            data.forEach(function (item) {
+              this.values.push({
+                key: item.id,
+                value: item.name
+              });
+            }, this);
+
+            this.option_values[value] = this.values;
+        })
+        .catch(error => {
+            this.form.loading = false;
+
+            this.form.onFail(error);
+
+            this.method_show_html = error.message;
+        });
+      } else {
+        this.values = this.option_values[value];
+      }
+
+      this.visible = {
+        options: false,
+        operator: true,
+        values: false,
+      };
+
+      this.filter_last_step = 'operator';
+
+      this.$nextTick(() => {
+        this.$refs['input-search-field-' + this._uid].focus();
+      });
+    },
+
+    onOperatorSelected(value) {
+      this.filtered[this.filter_index].operator = value;
+
+      this.$emit('change', this.filtered);
+
+      this.operatorValue = '';
+
+      this.$nextTick(() => {
+        this.$refs['input-search-field-' + this._uid].focus();
+      });
+
+      this.visible = {
+        options: false,
+        operator: false,
+        values: true,
+      };
+
+      this.filter_last_step = 'values';
+    },
+ 
+    onValueSelected(value) {
+      let select_value = false;
+
+      for (let i = 0; i < this.values.length; i++) {
+        if (this.values[i].key == value) {
+          select_value = this.values[i].value;
+
+          this.selected_values.push(this.values[i]);
+          this.option_values[this.current_value].splice(i, 1);
+          break;
+        }
+      }
+
+      this.filtered[this.filter_index].value = select_value;
+
+      this.$emit('change', this.filtered);
+
+      this.$nextTick(() => {
+        this.$refs['input-search-field-' + this._uid].focus();
+      });
+
+      this.filter_index++;
+
+      this.visible = {
+        options: true,
+        operator: false,
+        values: false,
+      };
+
+      this.filter_last_step = 'options';
+    },
+
+    onFilterDelete(index) {
+      this.filter_list.push(this.selected_options[index]);
+
+      this.filter_index--;
+
+      this.filtered.splice(index, 1);
+      this.selected_options.splice(index, 1);
+    },
+
+    onSearchAndFilterClear() {
+      this.filtered = [];
+      this.search = '';
+    },
+
+    closeIfClickedOutside(event) {
+      if (!document.getElementById('search-field-' + this._uid).contains(event.target)) {
+          this.visible.options = false;
+          this.visible.operator = false;
+          this.visible.values = false;
+
+          document.removeEventListener('click', this.closeIfClickedOutside);
+      }
+    },
+  },
+
+  created() {
+    if (this.value) {
+      let serach_string = this.value.split(' ');
+
+      serach_string.forEach(function (string) {
+        if (string.search(':') === -1) {
+          this.search = string;
+        } else {
+          let filter = string.split(':');
+
+          this.filtered.push({
+            option: filter[0],
+            operator: '=',
+            value: filter[1]
+          })
+        }
+      }, this);
     }
+  },
+
+  computed: {
+    filteredOptions() {
+      this.filter_list.sort(function (a, b) {
+          var nameA = a.value.toUpperCase(); // ignore upper and lowercase
+          var nameB = b.value.toUpperCase(); // ignore upper and lowercase
+
+          if (nameA < nameB) {
+            return -1;
+          }
+
+          if (nameA > nameB) {
+            return 1;
+          }
+
+          // names must be equal
+          return 0;
+      });
+
+      return this.filter_list.filter(option => {
+        return option.value.toLowerCase().includes(this.search.toLowerCase())
+      }); 
+    },
+
+    filteredValues() {
+      this.values.sort(function (a, b) {
+          var nameA = a.value.toUpperCase(); // ignore upper and lowercase
+          var nameB = b.value.toUpperCase(); // ignore upper and lowercase
+
+          if (nameA < nameB) {
+            return -1;
+          }
+
+          if (nameA > nameB) {
+            return 1;
+          }
+
+          // names must be equal
+          return 0;
+      });
+
+      return this.values.filter(value => {
+        return value.value.toLowerCase().includes(this.search.toLowerCase())
+      })
+    }
+  },
+
+   watch: {
+      visible: {
+        handler: function(newValue) {
+            if (newValue) {
+                document.addEventListener('click', this.closeIfClickedOutside);
+            }
+        },
+        deep: true
+      }
+    },
+};
 </script>
+
+<style>
+.searh-field {
+    border: 1px solid #dee2e6;
+    border-radius: 0.25rem;
+}
+
+.searh-field .tags-group {
+  display: contents;
+}
+
+.searh-field .el-tag.el-tag--primary {
+  background: #f6f9fc;
+  background-color: #f6f9fc;
+  border-color: #f6f9fc;
+  color: #8898aa;
+  margin-top: 7px;
+}
+
+.searh-field .tags-group:hover > span {
+  background:#cbd4de;
+  background-color: #cbd4de;
+  border-color: #cbd4de;
+}
+
+.searh-field .el-tag.el-tag--primary .el-tag__close.el-icon-close {
+  color: #8898aa;
+}
+
+.searh-field .el-tag-option {
+  border-radius: 0.25rem 0 0 0.25rem;
+  margin-left: 10px;
+}
+
+.searh-field .el-tag-operator {
+  border-radius: 0;
+  margin-left: -1px;
+  margin-right: -1px;
+}
+
+.searh-field .el-tag-value {
+  border-radius: 0 0.25rem 0.25rem 0;
+  margin-right: 10px;
+}
+
+.searh-field .el-select.input-new-tag {
+    width: 100%;
+}
+
+.searh-field .input-full {
+  width: 100%;
+}
+
+.searh-field .btn.btn-link {
+  width: inherit;
+  text-align: left;
+  display: flex;
+  margin: 0;
+  text-overflow: inherit;
+  text-align: left;
+  text-overflow: ellipsis;
+  padding: unset;
+  color: #212529;
+}
+
+.searh-field .btn.btn-link.clear {
+  position: absolute;
+  top: 0;
+  right: 0;
+  width: 45px;
+  height: 45px;
+  -webkit-box-pack: center;
+  -ms-flex-pack: center;
+  justify-content: center;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+  color: #adb5bd;
+  opacity: 1;
+}
+
+.searh-field .btn.btn-link.clear:hover {
+  color: #8898aa;
+}
+
+.searh-field .btn-helptext {
+  margin-left: auto;
+  color: var(--gray);
+}
+
+.searh-field .btn:not(:disabled):not(.disabled):active:focus,
+.searh-field .btn:not(:disabled):not(.disabled).active:focus {
+  -webkit-box-shadow: none !important;
+    box-shadow: none !important;
+}
+</style>
\ No newline at end of file
diff --git a/resources/lang/en-GB/general.php b/resources/lang/en-GB/general.php
index 7c3426789..86eb36c0e 100644
--- a/resources/lang/en-GB/general.php
+++ b/resources/lang/en-GB/general.php
@@ -105,7 +105,7 @@ return [
     'to'                    => 'To',
     'print'                 => 'Print',
     'search'                => 'Search',
-    'search_placeholder'    => 'Type to search..',
+    'search_placeholder'    => 'Search or filter results..',
     'filter'                => 'Filter',
     'help'                  => 'Help',
     'all'                   => 'All',
diff --git a/resources/views/auth/permissions/index.blade.php b/resources/views/auth/permissions/index.blade.php
index 54d53b2e0..381594d41 100644
--- a/resources/views/auth/permissions/index.blade.php
+++ b/resources/views/auth/permissions/index.blade.php
@@ -18,10 +18,7 @@
                 'class' => 'mb-0'
             ]) !!}
                 <div class="align-items-center" v-if="!bulk_action.show">
-                    <akaunting-search
-                        :placeholder="'{{ trans('general.search_placeholder') }}'"
-                        :options="{{ json_encode([]) }}"
-                    ></akaunting-search>
+                    <x-search-string model="App\Models\Auth\Permission" />
                 </div>
 
                 {{ Form::bulkActionRowGroup('general.permissions', $bulk_actions, ['group' => 'auth', 'type' => 'permissions']) }}
diff --git a/resources/views/auth/roles/index.blade.php b/resources/views/auth/roles/index.blade.php
index a24fcabd3..992b7ff9e 100644
--- a/resources/views/auth/roles/index.blade.php
+++ b/resources/views/auth/roles/index.blade.php
@@ -18,10 +18,7 @@
                 'class' => 'mb-0'
             ]) !!}
                 <div class="align-items-center" v-if="!bulk_action.show">
-                    <akaunting-search
-                        :placeholder="'{{ trans('general.search_placeholder') }}'"
-                        :options="{{ json_encode([]) }}"
-                    ></akaunting-search>
+                    <x-search-string model="App\Models\Auth\Role" />
                 </div>
 
                 {{ Form::bulkActionRowGroup('general.roles', $bulk_actions, ['group' => 'auth', 'type' => 'roles']) }}
diff --git a/resources/views/auth/users/index.blade.php b/resources/views/auth/users/index.blade.php
index 69e5cd50f..a5d283672 100644
--- a/resources/views/auth/users/index.blade.php
+++ b/resources/views/auth/users/index.blade.php
@@ -18,10 +18,7 @@
                 'class' => 'mb-0'
             ]) !!}
                 <div class="align-items-center" v-if="!bulk_action.show">
-                    <akaunting-search
-                        :placeholder="'{{ trans('general.search_placeholder') }}'"
-                        :options="{{ json_encode([]) }}"
-                    ></akaunting-search>
+                    <x-search-string model="App\Models\Auth\User" />
                 </div>
 
                 {{ Form::bulkActionRowGroup('general.users', $bulk_actions, ['group' => 'auth', 'type' => 'users']) }}
diff --git a/resources/views/banking/accounts/index.blade.php b/resources/views/banking/accounts/index.blade.php
index 888ff8cc7..24df6f215 100644
--- a/resources/views/banking/accounts/index.blade.php
+++ b/resources/views/banking/accounts/index.blade.php
@@ -18,10 +18,7 @@
                 'class' => 'mb-0'
             ]) !!}
                 <div class="align-items-center" v-if="!bulk_action.show">
-                    <akaunting-search
-                        :placeholder="'{{ trans('general.search_placeholder') }}'"
-                        :options="{{ json_encode([]) }}"
-                    ></akaunting-search>
+                    <x-search-string model="App\Models\Banking\Account" />
                 </div>
 
                 {{ Form::bulkActionRowGroup('general.accounts', $bulk_actions, ['group' => 'banking', 'type' => 'accounts']) }}
diff --git a/resources/views/banking/reconciliations/index.blade.php b/resources/views/banking/reconciliations/index.blade.php
index 2c0a9b255..d5ceabef9 100644
--- a/resources/views/banking/reconciliations/index.blade.php
+++ b/resources/views/banking/reconciliations/index.blade.php
@@ -19,10 +19,7 @@
                     'class' => 'mb-0'
                 ]) !!}
                     <div class="align-items-center" v-if="!bulk_action.show">
-                        <akaunting-search
-                            :placeholder="'{{ trans('general.search_placeholder') }}'"
-                            :options="{{ json_encode([]) }}"
-                        ></akaunting-search>
+                        <x-search-string model="App\Models\Banking\Reconciliation" />
                     </div>
 
                     {{ Form::bulkActionRowGroup('general.reconciliations', $bulk_actions, ['group' => 'banking', 'type' => 'reconciliations']) }}
diff --git a/resources/views/banking/transactions/index.blade.php b/resources/views/banking/transactions/index.blade.php
index 58d9a3a95..6b16ba24a 100644
--- a/resources/views/banking/transactions/index.blade.php
+++ b/resources/views/banking/transactions/index.blade.php
@@ -22,10 +22,7 @@
                 'role' => 'form',
                 'class' => 'mb-0'
             ]) !!}
-                <akaunting-search
-                    :placeholder="'{{ trans('general.search_placeholder') }}'"
-                    :options="{{ json_encode([]) }}"
-                ></akaunting-search>
+                <x-search-string model="App\Models\Banking\Transaction" />
             {!! Form::close() !!}
         </div>
 
diff --git a/resources/views/banking/transfers/index.blade.php b/resources/views/banking/transfers/index.blade.php
index f2f3b08f0..3b13700ec 100644
--- a/resources/views/banking/transfers/index.blade.php
+++ b/resources/views/banking/transfers/index.blade.php
@@ -21,10 +21,7 @@
                     'class' => 'mb-0'
                 ]) !!}
                     <div class="align-items-center" v-if="!bulk_action.show">
-                        <akaunting-search
-                            :placeholder="'{{ trans('general.search_placeholder') }}'"
-                            :options="{{ json_encode([]) }}"
-                        ></akaunting-search>
+                        <x-search-string model="App\Models\Banking\Transfer" />
                     </div>
 
                     {{ Form::bulkActionRowGroup('general.transfers', $bulk_actions, ['group' => 'banking', 'type' => 'transfers']) }}
diff --git a/resources/views/common/companies/index.blade.php b/resources/views/common/companies/index.blade.php
index b4de518d9..40049bbe9 100644
--- a/resources/views/common/companies/index.blade.php
+++ b/resources/views/common/companies/index.blade.php
@@ -18,10 +18,7 @@
                 'class' => 'mb-0'
             ]) !!}
                 <div class="align-items-center" v-if="!bulk_action.show">
-                    <akaunting-search
-                        :placeholder="'{{ trans('general.search_placeholder') }}'"
-                        :options="{{ json_encode([]) }}"
-                    ></akaunting-search>
+                    <x-search-string model="App\Models\Common\Company" />
                 </div>
 
                 {{ Form::bulkActionRowGroup('general.companies', $bulk_actions, ['group' => 'common', 'type' => 'companies']) }}
diff --git a/resources/views/common/dashboards/index.blade.php b/resources/views/common/dashboards/index.blade.php
index 06cc6964a..a7536c528 100644
--- a/resources/views/common/dashboards/index.blade.php
+++ b/resources/views/common/dashboards/index.blade.php
@@ -18,10 +18,7 @@
                 'class' => 'mb-0'
             ]) !!}
                 <div class="align-items-center" v-if="!bulk_action.show">
-                    <akaunting-search
-                        :placeholder="'{{ trans('general.search_placeholder') }}'"
-                        :options="{{ json_encode([]) }}"
-                    ></akaunting-search>
+                    <x-search-string model="App\Models\Common\Dashboard" />
                 </div>
 
                 {{ Form::bulkActionRowGroup('general.dashboards', $bulk_actions, ['group' => 'common', 'type' => 'dashboards']) }}
diff --git a/resources/views/common/items/index.blade.php b/resources/views/common/items/index.blade.php
index 6a7170a7f..9e6b48018 100644
--- a/resources/views/common/items/index.blade.php
+++ b/resources/views/common/items/index.blade.php
@@ -21,10 +21,7 @@
                     'class' => 'mb-0'
                 ]) !!}
                     <div class="align-items-center" v-if="!bulk_action.show">
-                        <akaunting-search
-                            :placeholder="'{{ trans('general.search_placeholder') }}'"
-                            :options="{{ json_encode([]) }}"
-                        ></akaunting-search>
+                        <x-search-string model="App\Models\Common\Item" />
                     </div>
 
                     {{ Form::bulkActionRowGroup('general.items', $bulk_actions, ['group' => 'common', 'type' => 'items']) }}
diff --git a/resources/views/components/search-string.blade.php b/resources/views/components/search-string.blade.php
new file mode 100644
index 000000000..d655b6dc8
--- /dev/null
+++ b/resources/views/components/search-string.blade.php
@@ -0,0 +1,7 @@
+
+<akaunting-search
+    placeholder="{{ trans('general.search_placeholder') }}"
+    text-search="{{ trans('Search for this text') }}"
+    value="{{ request()->get('search', null) }}"
+    :filters="{{ json_encode($filters) }}"
+></akaunting-search>
diff --git a/resources/views/purchases/bills/index.blade.php b/resources/views/purchases/bills/index.blade.php
index 97f715f75..540b72cc7 100644
--- a/resources/views/purchases/bills/index.blade.php
+++ b/resources/views/purchases/bills/index.blade.php
@@ -21,10 +21,7 @@
                     'class' => 'mb-0'
                 ]) !!}
                     <div class="align-items-center" v-if="!bulk_action.show">
-                        <akaunting-search
-                            :placeholder="'{{ trans('general.search_placeholder') }}'"
-                            :options="{{ json_encode([]) }}"
-                        ></akaunting-search>
+                        <x-search-string model="App\Models\Purchase\Bill" />
                     </div>
 
                     {{ Form::bulkActionRowGroup('general.bills', $bulk_actions, ['group' => 'purchases', 'type' => 'bills']) }}
diff --git a/resources/views/purchases/payments/index.blade.php b/resources/views/purchases/payments/index.blade.php
index 3c24e4cb6..7aa451d26 100644
--- a/resources/views/purchases/payments/index.blade.php
+++ b/resources/views/purchases/payments/index.blade.php
@@ -21,10 +21,7 @@
                     'class' => 'mb-0'
                 ]) !!}
                     <div class="align-items-center" v-if="!bulk_action.show">
-                        <akaunting-search
-                            :placeholder="'{{ trans('general.search_placeholder') }}'"
-                            :options="{{ json_encode([]) }}"
-                        ></akaunting-search>
+                        <x-search-string model="App\Models\Banking\Transaction" />
                     </div>
 
                     {{ Form::bulkActionRowGroup('general.payments', $bulk_actions, ['group' => 'purchases', 'type' => 'payments']) }}
diff --git a/resources/views/purchases/vendors/index.blade.php b/resources/views/purchases/vendors/index.blade.php
index 8d2f4501a..c1045e75b 100644
--- a/resources/views/purchases/vendors/index.blade.php
+++ b/resources/views/purchases/vendors/index.blade.php
@@ -21,10 +21,7 @@
                     'class' => 'mb-0'
                 ]) !!}
                     <div class="align-items-center" v-if="!bulk_action.show">
-                        <akaunting-search
-                            :placeholder="'{{ trans('general.search_placeholder') }}'"
-                            :options="{{ json_encode([]) }}"
-                        ></akaunting-search>
+                        <x-search-string model="App\Models\Common\Contact" />
                     </div>
 
                     {{ Form::bulkActionRowGroup('general.vendors', $bulk_actions, ['group' => 'purchases', 'type' => 'vendors']) }}
diff --git a/resources/views/sales/customers/index.blade.php b/resources/views/sales/customers/index.blade.php
index 0b067419d..824341b7a 100644
--- a/resources/views/sales/customers/index.blade.php
+++ b/resources/views/sales/customers/index.blade.php
@@ -21,10 +21,7 @@
                     'class' => 'mb-0'
                 ]) !!}
                     <div class="align-items-center" v-if="!bulk_action.show">
-                        <akaunting-search
-                            :placeholder="'{{ trans('general.search_placeholder') }}'"
-                            :options="{{ json_encode([]) }}"
-                        ></akaunting-search>
+                        <x-search-string model="App\Models\Common\Contact" />
                     </div>
 
                     {{ Form::bulkActionRowGroup('general.customers', $bulk_actions, ['group' => 'sales', 'type' => 'customers']) }}
diff --git a/resources/views/sales/invoices/index.blade.php b/resources/views/sales/invoices/index.blade.php
index ec9deea37..03649eb26 100644
--- a/resources/views/sales/invoices/index.blade.php
+++ b/resources/views/sales/invoices/index.blade.php
@@ -21,10 +21,7 @@
                     'class' => 'mb-0'
                 ]) !!}
                     <div class="align-items-center" v-if="!bulk_action.show">
-                        <akaunting-search
-                            :placeholder="'{{ trans('general.search_placeholder') }}'"
-                            :options="{{ json_encode([]) }}"
-                        ></akaunting-search>
+                        <x-search-string model="App\Models\Sale\Invoice" />
                     </div>
 
                     {{ Form::bulkActionRowGroup('general.invoices', $bulk_actions, ['group' => 'sales', 'type' => 'invoices']) }}
diff --git a/resources/views/sales/revenues/index.blade.php b/resources/views/sales/revenues/index.blade.php
index 75930749e..42f6cab05 100644
--- a/resources/views/sales/revenues/index.blade.php
+++ b/resources/views/sales/revenues/index.blade.php
@@ -21,10 +21,7 @@
                     'class' => 'mb-0'
                 ]) !!}
                     <div class="align-items-center" v-if="!bulk_action.show">
-                        <akaunting-search
-                            :placeholder="'{{ trans('general.search_placeholder') }}'"
-                            :options="{{ json_encode([]) }}"
-                        ></akaunting-search>
+                        <x-search-string model="App\Models\Banking\Transaction" />
                     </div>
 
                     {{ Form::bulkActionRowGroup('general.revenues', $bulk_actions, ['group' => 'sales', 'type' => 'revenues']) }}
diff --git a/resources/views/settings/categories/index.blade.php b/resources/views/settings/categories/index.blade.php
index 50d1a1ade..ac5b2a67f 100644
--- a/resources/views/settings/categories/index.blade.php
+++ b/resources/views/settings/categories/index.blade.php
@@ -18,10 +18,7 @@
                 'class' => 'mb-0'
             ]) !!}
                 <div class="align-items-center" v-if="!bulk_action.show">
-                    <akaunting-search
-                        :placeholder="'{{ trans('general.search_placeholder') }}'"
-                        :options="{{ json_encode([]) }}"
-                    ></akaunting-search>
+                    <x-search-string model="App\Models\Setting\Category" />
                 </div>
 
                 {{ Form::bulkActionRowGroup('general.categories', $bulk_actions, ['group' => 'settings', 'type' => 'categories']) }}
diff --git a/resources/views/settings/currencies/index.blade.php b/resources/views/settings/currencies/index.blade.php
index 3a22a21ba..259cbfd45 100644
--- a/resources/views/settings/currencies/index.blade.php
+++ b/resources/views/settings/currencies/index.blade.php
@@ -18,10 +18,7 @@
                 'class' => 'mb-0'
             ]) !!}
                 <div class="align-items-center" v-if="!bulk_action.show">
-                    <akaunting-search
-                        :placeholder="'{{ trans('general.search_placeholder') }}'"
-                        :options="{{ json_encode([]) }}"
-                    ></akaunting-search>
+                    <x-search-string model="App\Models\Setting\Currency" />
                 </div>
 
                 {{ Form::bulkActionRowGroup('general.currencies', $bulk_actions, ['group' => 'settings', 'type' => 'currencies']) }}
diff --git a/resources/views/settings/taxes/index.blade.php b/resources/views/settings/taxes/index.blade.php
index fd22cde08..cbea11413 100644
--- a/resources/views/settings/taxes/index.blade.php
+++ b/resources/views/settings/taxes/index.blade.php
@@ -19,10 +19,7 @@
                     'class' => 'mb-0'
                 ]) !!}
                     <div class="align-items-center" v-if="!bulk_action.show">
-                        <akaunting-search
-                            :placeholder="'{{ trans('general.search_placeholder') }}'"
-                            :options="{{ json_encode([]) }}"
-                        ></akaunting-search>
+                        <x-search-string model="App\Models\Setting\Tax" />
                     </div>
 
                     {{ Form::bulkActionRowGroup('general.taxes', $bulk_actions, ['group' => 'settings', 'type' => 'taxes']) }}

From a9ab2e61a0f6a6a86ac001cc5bde8265e380c492 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Fri, 6 Nov 2020 22:34:53 +0300
Subject: [PATCH 2/6] refs search filter files..

---
 app/View/Components/SearchString.php          |  86 ++++++++++++-
 .../assets/js/components/AkauntingSearch.vue  | 117 +++++++++++++++---
 resources/lang/en-GB/general.php              |  10 +-
 .../views/components/search-string.blade.php  |   9 +-
 4 files changed, 195 insertions(+), 27 deletions(-)

diff --git a/app/View/Components/SearchString.php b/app/View/Components/SearchString.php
index d7969ad06..cfedd9190 100644
--- a/app/View/Components/SearchString.php
+++ b/app/View/Components/SearchString.php
@@ -30,12 +30,13 @@ class SearchString extends Component
     {
         $searc_string = config('search-string');
 
-        $this->filters = false;
+        $this->filters = [];
 
         if (!empty($searc_string[$this->model])) {
             $columns = $searc_string[$this->model]['columns'];
 
             foreach ($columns as $column => $options) {
+                // This column skip for filter
                 if (!empty($options['searchable'])) {
                     continue;
                 }
@@ -43,13 +44,13 @@ class SearchString extends Component
                 if (!is_array($options)) {
                     $column = $options;
                 }
-
-                $name = $this->getFilterName($column);
     
                 $this->filters[] = [
-                    'key' => $column,
-                    'value' => $name,
-                    'url' => !empty($options['route']) ? route($options['route'][0], $options['route'][1]) : ''
+                    'key' => $this->getFilterKey($column, $options),
+                    'value' => $this->getFilterName($column),
+                    'type' => $this->getFilterType($options),
+                    'url' => $this->getFilterUrl($column, $options),
+                    'values' => $this->getFilterValues($options),
                 ];
             }
         }
@@ -57,6 +58,15 @@ class SearchString extends Component
         return view('components.search-string');
     }
 
+    protected function getFilterKey($column, $options)
+    {
+        if (isset($options['relationship'])) {
+            $column .= '.id';
+        }
+
+        return $column;
+    }
+
     protected function getFilterName($column)
     {
         if (strpos($column, '_id') !== false) {
@@ -79,4 +89,68 @@ class SearchString extends Component
 
         return $name;
     }
+
+    protected function getFilterType($options) 
+    {
+        $type = 'select';
+
+        if (isset($options['boolean'])) {
+            $type = 'boolean';
+        }
+
+        return $type;
+    }
+
+    protected function getFilterUrl($column, $options) 
+    {
+        $url = '';
+
+        if (isset($options['boolean'])) {
+            return $url;
+        }
+
+        if (!empty($options['route'])) {
+            if (is_array($options['route'])) {
+                $url = route($options['route'][0], $options['route'][1]);
+            } else {
+                $url = route($options['route']);
+            }
+        } else {
+            if (strpos($this->model, 'Modules') !== false) {
+                $module_class = explode('\\', $this->model);
+
+                $url .= Str::slug($module_class[1], '-') . '::';
+            }
+            
+            if (strpos($column, '_id') !== false) {
+                $column = str_replace('_id', '', $column);
+            }
+    
+            $plural = Str::plural($column, 2);
+
+            $url = route($url . $plural . '.index');
+        }
+
+        return $url;
+    }
+
+    protected function getFilterValues($options) 
+    {
+        $values = [];
+
+        if (isset($options['boolean'])) {
+            $values = [
+                [
+                    'key' => 0,
+                    'value' => trans('general.no'),
+                ],
+                [
+                    'key' => 1,
+                    'value' => trans('general.yes'),
+                ],
+            ];
+        }
+
+        return $values;
+    }
 }
diff --git a/resources/assets/js/components/AkauntingSearch.vue b/resources/assets/js/components/AkauntingSearch.vue
index 238c34490..ed3f893d6 100644
--- a/resources/assets/js/components/AkauntingSearch.vue
+++ b/resources/assets/js/components/AkauntingSearch.vue
@@ -36,16 +36,16 @@
           <button type="button" class="btn btn-link" @click="onOptionSelected(option.key)">{{ option.value }}</button>
         </li>
         <li ref="" v-if="search" class="dropdown-item">
-          <button type="button" class="btn btn-link" @click="onInputConfirm">{{ textSearch }}</button>
+          <button type="button" class="btn btn-link" @click="onInputConfirm">{{ searchText }}</button>
         </li>
       </div>
 
       <div class="dropdown-menu" :class="[{'show': visible.operator}]">
         <li ref="" class="dropdown-item">
-          <button type="button" class="btn btn-link" @click="onOperatorSelected('=')">=<span class="btn-helptext">is</span></button>
+          <button type="button" class="btn btn-link" @click="onOperatorSelected('=')">{{ operatorIsText }}<span class="btn-helptext d-none">is</span></button>
         </li>
         <li ref="" class="dropdown-item">
-          <button type="button" class="btn btn-link" @click="onOperatorSelected('!=')">!=<span class="btn-helptext">is not</span></button>
+          <button type="button" class="btn btn-link" @click="onOperatorSelected('!=')">{{ operatorIsNotText }}<span class="btn-helptext d-none">is not</span></button>
         </li>
       </div>
 
@@ -53,6 +53,9 @@
         <li ref="" class="dropdown-item" v-for="(value) in filteredValues" :data-value="value.key">
           <button type="button" class="btn btn-link" @click="onValueSelected(value.key)">{{ value.value }}</button>
         </li>
+        <li ref="" class="dropdown-item" v-if="!filteredValues.length">
+          <button type="button" class="btn btn-link">{{ noMatchingDataText }}</button>
+        </li>
       </div>
     </div>
   </div>
@@ -68,11 +71,31 @@ export default {
       default: 'Search or filter results...',
       description: 'Input placeholder'
     },
-    textSearch: {
+    searchText: {
       type: String,
       default: 'Search for this text',
       description: 'Input placeholder'
     },
+    operatorIsText: {
+      type: String,
+      default: 'is',
+      description: 'Operator is "="'
+    },
+    operatorIsNotText: {
+      type: String,
+      default: 'is not',
+      description: 'Operator is not "!="'
+    },
+    noDataText: {
+        type: String,
+        default: 'No Data',
+        description: "Selectbox empty options message"
+    },
+    noMatchingDataText: {
+        type: String,
+        default: 'No Matchign Data',
+        description: "Selectbox search option not found item message"
+    },
     value: {
       type: String,
       default: null,
@@ -113,6 +136,10 @@ export default {
 
   methods: {
     onInputFocus() {
+      if (!this.filters.length) {
+        return;
+      }
+
       this.visible[this.filter_last_step] = true;
 
       this.$nextTick(() => {
@@ -122,6 +149,31 @@ export default {
 
     onInput(evt) {
       this.search = evt.target.value;
+  
+      let option_url = this.selected_options[this.filter_index].url;
+
+      if (this.search) {
+        option_url += '?search=' + this.search;
+      }
+
+      window.axios.get(option_url)
+      .then(response => {
+          this.values = [];
+
+          let data = response.data.data;
+
+          data.forEach(function (item) {
+            this.values.push({
+              key: item.id,
+              value: item.name
+            });
+          }, this);
+
+          this.option_values[value] = this.values;
+      })
+      .catch(error => {
+
+      });
 
       this.$emit('input', evt.target.value);
     },
@@ -138,17 +190,17 @@ export default {
           args += '?search=';
         }
 
-        args += this.selected_options[index].key + ':' + this.selected_values[index].key;
+        args += this.selected_options[index].key + ':' + this.selected_values[index].key + ' ';
       }, this);
 
-      window.location = url + '/common/items' + args;
+      window.location = window.location.href.replace(window.location.search, '') + args;
     },
 
     onOptionSelected(value) {
       this.current_value = value;
 
       let option = false;
-      let option_url = url + '';
+      let option_url = url;
 
       for (let i = 0; i < this.filter_list.length; i++) {
         if (this.filter_list[i].key == value) {
@@ -158,6 +210,10 @@ export default {
             option_url = this.filter_list[i].url;
           }
 
+          if (typeof this.filter_list[i].type !== 'undefined' && this.filter_list[i].type == 'boolean') {
+            this.option_values[value] = this.filter_list[i].values;
+          }
+
           this.selected_options.push(this.filter_list[i]);
           this.filter_list.splice(i, 1);
           break;
@@ -190,11 +246,7 @@ export default {
             this.option_values[value] = this.values;
         })
         .catch(error => {
-            this.form.loading = false;
 
-            this.form.onFail(error);
-
-            this.method_show_html = error.message;
         });
       } else {
         this.values = this.option_values[value];
@@ -277,13 +329,15 @@ export default {
     onSearchAndFilterClear() {
       this.filtered = [];
       this.search = '';
+
+      this.onInputConfirm();
     },
 
     closeIfClickedOutside(event) {
       if (!document.getElementById('search-field-' + this._uid).contains(event.target)) {
-          this.visible.options = false;
-          this.visible.operator = false;
-          this.visible.values = false;
+          //this.visible.options = false;
+          //this.visible.operator = false;
+          //this.visible.values = false;
 
           document.removeEventListener('click', this.closeIfClickedOutside);
       }
@@ -299,12 +353,41 @@ export default {
           this.search = string;
         } else {
           let filter = string.split(':');
+          let option = '';
+          let value = '';
+
+          this.filter_list.forEach(function (_filter, i) {
+            if (_filter.key == filter[0]) {
+              option = _filter.value;
+
+              _filter.values.forEach(function (_value) {
+                if (_value.key == filter[1]) {
+                  value = _value.value;
+                }
+              }, this);
+
+              this.selected_options.push(this.filter_list[i]);
+              this.filter_list.splice(i, 1);
+
+              this.option_values[_filter.key] = _filter.values;
+
+              _filter.values.forEach(function (value, j) {
+                if (value.key == filter[1]) {
+                  this.selected_values.push(value);
+
+                  this.option_values[_filter.key].splice(j, 1);
+                }
+              }, this);
+            }
+          }, this);
 
           this.filtered.push({
-            option: filter[0],
+            option: option,
             operator: '=',
-            value: filter[1]
-          })
+            value: value
+          });
+
+          this.filter_index++;
         }
       }, this);
     }
diff --git a/resources/lang/en-GB/general.php b/resources/lang/en-GB/general.php
index 86eb36c0e..6d6a1a153 100644
--- a/resources/lang/en-GB/general.php
+++ b/resources/lang/en-GB/general.php
@@ -105,7 +105,8 @@ return [
     'to'                    => 'To',
     'print'                 => 'Print',
     'search'                => 'Search',
-    'search_placeholder'    => 'Search or filter results..',
+    'search_text'           => 'Search for this text',
+    'search_placeholder'    => 'Type to search..',
     'filter'                => 'Filter',
     'help'                  => 'Help',
     'all'                   => 'All',
@@ -152,6 +153,8 @@ return [
     'no_matching_data'      => 'No matching data',
     'clear_cache'           => 'Clear Cache',
     'go_to_dashboard'       => 'Go to dashboard',
+    'is'                    => 'is',
+    'isnot'                 => 'is not', 
 
     'card' => [
         'name'                  => 'Name on Card',
@@ -181,6 +184,11 @@ return [
         'no_file_selected'  => 'No file selected...',
     ],
 
+    'placeholder' => [
+        'search'            => 'Type to search..',
+        'search_and_filter' => 'Search or filter results..',
+    ],
+
     'date_range' => [
         'today' => 'Today',
         'yesterday' => 'Yesterday',
diff --git a/resources/views/components/search-string.blade.php b/resources/views/components/search-string.blade.php
index d655b6dc8..fe89a5f41 100644
--- a/resources/views/components/search-string.blade.php
+++ b/resources/views/components/search-string.blade.php
@@ -1,7 +1,10 @@
-
 <akaunting-search
-    placeholder="{{ trans('general.search_placeholder') }}"
-    text-search="{{ trans('Search for this text') }}"
+    placeholder="{{ (!empty($filters)) ? trans('general.placeholder.search_and_filter') : trans('general.search_placeholder')}}"
+    search-text="{{ trans('general.search_text') }}"
+    operator-is-text="{{ trans('general.is') }}"
+    operator-is-not-text="{{ trans('general.isnot') }}" 
+    no-data-text="{{ trans('general.no_data') }}"
+    no-matching-data-text="{{ trans('general.no_matching_data') }}"
     value="{{ request()->get('search', null) }}"
     :filters="{{ json_encode($filters) }}"
 ></akaunting-search>

From 4f8a1661fcb741ce6dc09f5c1bf760d915f293a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Mon, 9 Nov 2020 20:30:05 +0300
Subject: [PATCH 3/6] index blade fixes..

---
 app/View/Components/SearchString.php          | 18 +++-
 public/css/custom.css                         |  6 ++
 public/vendor/js-cookie/js.cookie.js          | 24 +++++-
 .../assets/js/components/AkauntingSearch.vue  | 84 ++++++++++++++-----
 resources/assets/js/views/auth/roles.js       |  2 +-
 .../banking/reconciliations/index.blade.php   |  2 +-
 .../views/banking/transfers/index.blade.php   |  2 +-
 resources/views/common/items/index.blade.php  |  2 +-
 .../views/purchases/bills/index.blade.php     |  2 +-
 .../views/purchases/payments/index.blade.php  |  2 +-
 .../views/purchases/vendors/index.blade.php   |  2 +-
 .../views/sales/customers/index.blade.php     |  2 +-
 .../views/sales/invoices/index.blade.php      |  2 +-
 .../views/sales/revenues/index.blade.php      |  2 +-
 .../views/settings/taxes/index.blade.php      |  2 +-
 15 files changed, 117 insertions(+), 37 deletions(-)

diff --git a/app/View/Components/SearchString.php b/app/View/Components/SearchString.php
index cfedd9190..51ef8500c 100644
--- a/app/View/Components/SearchString.php
+++ b/app/View/Components/SearchString.php
@@ -50,7 +50,7 @@ class SearchString extends Component
                     'value' => $this->getFilterName($column),
                     'type' => $this->getFilterType($options),
                     'url' => $this->getFilterUrl($column, $options),
-                    'values' => $this->getFilterValues($options),
+                    'values' => $this->getFilterValues($column, $options),
                 ];
             }
         }
@@ -134,7 +134,7 @@ class SearchString extends Component
         return $url;
     }
 
-    protected function getFilterValues($options) 
+    protected function getFilterValues($column, $options) 
     {
         $values = [];
 
@@ -149,6 +149,20 @@ class SearchString extends Component
                     'value' => trans('general.yes'),
                 ],
             ];
+        } else if ($search = request()->get('search', false)) {
+            $fields = explode(' ', $search);
+
+            foreach ($fields as $field) {
+                if (strpos($field, ':') === false) {
+                    continue;
+                }
+
+                $filters = explode(':', $field);
+
+                if ($filters[0] != $column) {
+                    continue;
+                }
+            }
         }
 
         return $values;
diff --git a/public/css/custom.css b/public/css/custom.css
index daf4d6f16..8feca3952 100644
--- a/public/css/custom.css
+++ b/public/css/custom.css
@@ -846,3 +846,9 @@ table .align-items-center td span.badge {
     border: 1px solid #3c3f72;
 }
 /*--lightbox Finish--*/
+
+/*-- Search string & BulkAction Start --*/
+#app .card .card-header {
+    min-height: 88px;
+}
+/*-- Search string & BulkAction Finish --*/
\ No newline at end of file
diff --git a/public/vendor/js-cookie/js.cookie.js b/public/vendor/js-cookie/js.cookie.js
index 9a0945ed8..98f13c735 100644
--- a/public/vendor/js-cookie/js.cookie.js
+++ b/public/vendor/js-cookie/js.cookie.js
@@ -7,19 +7,26 @@
  */
 ;(function (factory) {
 	var registeredInModuleLoader = false;
+
 	if (typeof define === 'function' && define.amd) {
 		define(factory);
+
 		registeredInModuleLoader = true;
 	}
+
 	if (typeof exports === 'object') {
 		module.exports = factory();
+
 		registeredInModuleLoader = true;
 	}
+
 	if (!registeredInModuleLoader) {
 		var OldCookies = window.Cookies;
 		var api = window.Cookies = factory();
+
 		api.noConflict = function () {
 			window.Cookies = OldCookies;
+
 			return api;
 		};
 	}
@@ -27,24 +34,27 @@
 	function extend () {
 		var i = 0;
 		var result = {};
+
 		for (; i < arguments.length; i++) {
 			var attributes = arguments[ i ];
+
 			for (var key in attributes) {
 				result[key] = attributes[key];
 			}
 		}
+
 		return result;
 	}
 
 	function init (converter) {
 		function api (key, value, attributes) {
 			var result;
+
 			if (typeof document === 'undefined') {
 				return;
 			}
 
 			// Write
-
 			if (arguments.length > 1) {
 				attributes = extend({
 					path: '/'
@@ -52,7 +62,9 @@
 
 				if (typeof attributes.expires === 'number') {
 					var expires = new Date();
+
 					expires.setMilliseconds(expires.getMilliseconds() + attributes.expires * 864e+5);
+
 					attributes.expires = expires;
 				}
 
@@ -61,6 +73,7 @@
 
 				try {
 					result = JSON.stringify(value);
+
 					if (/^[\{\[]/.test(result)) {
 						value = result;
 					}
@@ -83,17 +96,20 @@
 					if (!attributes[attributeName]) {
 						continue;
 					}
+
 					stringifiedAttributes += '; ' + attributeName;
+
 					if (attributes[attributeName] === true) {
 						continue;
 					}
+
 					stringifiedAttributes += '=' + attributes[attributeName];
 				}
+
 				return (document.cookie = key + '=' + value + stringifiedAttributes);
 			}
 
 			// Read
-
 			if (!key) {
 				result = {};
 			}
@@ -115,6 +131,7 @@
 
 				try {
 					var name = parts[0].replace(rdecode, decodeURIComponent);
+
 					cookie = converter.read ?
 						converter.read(cookie, name) : converter(cookie, name) ||
 						cookie.replace(rdecode, decodeURIComponent);
@@ -140,14 +157,17 @@
 		}
 
 		api.set = api;
+
 		api.get = function (key) {
 			return api.call(api, key);
 		};
+
 		api.getJSON = function () {
 			return api.apply({
 				json: true
 			}, [].slice.call(arguments));
 		};
+
 		api.defaults = {};
 
 		api.remove = function (key, attributes) {
diff --git a/resources/assets/js/components/AkauntingSearch.vue b/resources/assets/js/components/AkauntingSearch.vue
index ed3f893d6..932cfc777 100644
--- a/resources/assets/js/components/AkauntingSearch.vue
+++ b/resources/assets/js/components/AkauntingSearch.vue
@@ -6,7 +6,7 @@
       </span>
 
       <span v-if="filter.operator" class="el-tag el-tag--primary el-tag--small el-tag--light el-tag-operator">
-        {{ filter.operator }}
+        {{ (filter.operator == '=') ? operatorIsText : operatorIsNotText }}
       </span>
 
       <span v-if="filter.value" class="el-tag el-tag--primary el-tag--small el-tag--light el-tag-value">
@@ -31,7 +31,7 @@
         <i class="el-tag__close el-icon-close"></i>
       </button>
 
-      <div class="dropdown-menu" :class="[{'show': visible.options}]">
+      <div :id="'search-field-option-' + _uid" class="dropdown-menu" :class="[{'show': visible.options}]">
         <li ref="" class="dropdown-item" v-for="option in filteredOptions" :data-value="option.key">
           <button type="button" class="btn btn-link" @click="onOptionSelected(option.key)">{{ option.value }}</button>
         </li>
@@ -40,7 +40,7 @@
         </li>
       </div>
 
-      <div class="dropdown-menu" :class="[{'show': visible.operator}]">
+      <div :id="'search-field-operator-' + _uid" class="dropdown-menu" :class="[{'show': visible.operator}]">
         <li ref="" class="dropdown-item">
           <button type="button" class="btn btn-link" @click="onOperatorSelected('=')">{{ operatorIsText }}<span class="btn-helptext d-none">is</span></button>
         </li>
@@ -49,7 +49,7 @@
         </li>
       </div>
 
-      <div class="dropdown-menu" :class="[{'show': visible.values}]">
+      <div :id="'search-field-value-' + _uid" class="dropdown-menu" :class="[{'show': visible.values}]">
         <li ref="" class="dropdown-item" v-for="(value) in filteredValues" :data-value="value.key">
           <button type="button" class="btn btn-link" @click="onValueSelected(value.key)">{{ value.value }}</button>
         </li>
@@ -136,7 +136,7 @@ export default {
 
   methods: {
     onInputFocus() {
-      if (!this.filters.length) {
+      if (!this.filter_list.length) {
         return;
       }
 
@@ -145,6 +145,8 @@ export default {
       this.$nextTick(() => {
         this.$refs['input-search-field-' + this._uid].focus();
       });
+
+      console.log('Focus :' + this.filter_last_step);
     },
 
     onInput(evt) {
@@ -179,21 +181,37 @@ export default {
     },
 
     onInputConfirm() {
+      let path = window.location.href.replace(window.location.search, '');
       let args = '';
 
       if (this.search) {
-        args += '?search=' + this.search;
+        args += '?search=' + this.search + ' ';
       }
 
+      let now = new Date();
+      now.setTime(now.getTime() + 1 * 3600 * 1000);
+      let expires = now.toUTCString();
+
+      let serach_string = {};
+      serach_string[path] = {};
+
       this.filtered.forEach(function (filter, index) {
         if (!args) {
           args += '?search=';
         }
 
         args += this.selected_options[index].key + ':' + this.selected_values[index].key + ' ';
+
+        
+        serach_string[path][this.selected_options[index].key] = {
+          'key': this.selected_values[index].key,
+          'value': this.selected_values[index].value
+        };
       }, this);
 
-      window.location = window.location.href.replace(window.location.search, '') + args;
+      Cookies.set('search-string', serach_string, expires);
+
+      window.location = path + args;
     },
 
     onOptionSelected(value) {
@@ -252,6 +270,10 @@ export default {
         this.values = this.option_values[value];
       }
 
+      this.$nextTick(() => {
+        this.$refs['input-search-field-' + this._uid].focus();
+      });
+
       this.visible = {
         options: false,
         operator: true,
@@ -259,10 +281,6 @@ export default {
       };
 
       this.filter_last_step = 'operator';
-
-      this.$nextTick(() => {
-        this.$refs['input-search-field-' + this._uid].focus();
-      });
     },
 
     onOperatorSelected(value) {
@@ -270,8 +288,6 @@ export default {
 
       this.$emit('change', this.filtered);
 
-      this.operatorValue = '';
-
       this.$nextTick(() => {
         this.$refs['input-search-field-' + this._uid].focus();
       });
@@ -308,11 +324,19 @@ export default {
 
       this.filter_index++;
 
-      this.visible = {
-        options: true,
-        operator: false,
-        values: false,
-      };
+      if (this.filter_list.length) {
+        this.visible = {
+          options: true,
+          operator: false,
+          values: false,
+        };
+      } else {
+        this.visible = {
+          options: false,
+          operator: false,
+          values: false,
+        };
+      }
 
       this.filter_last_step = 'options';
     },
@@ -330,14 +354,16 @@ export default {
       this.filtered = [];
       this.search = '';
 
+      Cookies.remove('search-string');
+
       this.onInputConfirm();
     },
 
     closeIfClickedOutside(event) {
-      if (!document.getElementById('search-field-' + this._uid).contains(event.target)) {
-          //this.visible.options = false;
-          //this.visible.operator = false;
-          //this.visible.values = false;
+      if (!document.getElementById('search-field-' + this._uid).contains(event.target) && event.target.className != 'btn btn-link') {
+          this.visible.options = false;
+          this.visible.operator = false;
+          this.visible.values = false;
 
           document.removeEventListener('click', this.closeIfClickedOutside);
       }
@@ -345,6 +371,12 @@ export default {
   },
 
   created() {
+    let path = window.location.href.replace(window.location.search, '');
+
+    let cookie = Cookies.get('search-string');
+
+    cookie = JSON.parse(cookie)[path];
+
     if (this.value) {
       let serach_string = this.value.split(' ');
 
@@ -366,6 +398,10 @@ export default {
                 }
               }, this);
 
+              if (!value && cookie[_filter.key]) {
+                value = cookie[_filter.key].value;
+              }
+
               this.selected_options.push(this.filter_list[i]);
               this.filter_list.splice(i, 1);
 
@@ -378,6 +414,10 @@ export default {
                   this.option_values[_filter.key].splice(j, 1);
                 }
               }, this);
+
+              if (cookie[_filter.key]) {
+                  this.selected_values.push(cookie[_filter.key]);
+              }
             }
           }, this);
 
diff --git a/resources/assets/js/views/auth/roles.js b/resources/assets/js/views/auth/roles.js
index 41bd92bd8..09da7f69a 100644
--- a/resources/assets/js/views/auth/roles.js
+++ b/resources/assets/js/views/auth/roles.js
@@ -26,7 +26,7 @@ const app = new Vue({
     ],
 
     mounted() {
-        if (!this.form.permissions.length) {
+        if (typeof this.form.permissions !== 'undefined' && !this.form.permissions.length) {
             this.form.permissions = [];
         }
     },
diff --git a/resources/views/banking/reconciliations/index.blade.php b/resources/views/banking/reconciliations/index.blade.php
index d5ceabef9..237fbaf17 100644
--- a/resources/views/banking/reconciliations/index.blade.php
+++ b/resources/views/banking/reconciliations/index.blade.php
@@ -9,7 +9,7 @@
 @endsection
 
 @section('content')
-    @if ($reconciliations->count())
+    @if ($reconciliations->count() || request()->get('search', false))
         <div class="card">
             <div class="card-header border-bottom-0" :class="[{'bg-gradient-primary': bulk_action.show}]">
                 {!! Form::open([
diff --git a/resources/views/banking/transfers/index.blade.php b/resources/views/banking/transfers/index.blade.php
index 3b13700ec..6c4a63031 100644
--- a/resources/views/banking/transfers/index.blade.php
+++ b/resources/views/banking/transfers/index.blade.php
@@ -11,7 +11,7 @@
 @endsection
 
 @section('content')
-    @if ($transfers->count())
+    @if ($transfers->count() || request()->get('search', false))
         <div class="card">
             <div class="card-header border-bottom-0" :class="[{'bg-gradient-primary': bulk_action.show}]">
                 {!! Form::open([
diff --git a/resources/views/common/items/index.blade.php b/resources/views/common/items/index.blade.php
index 9e6b48018..edd35a1ff 100644
--- a/resources/views/common/items/index.blade.php
+++ b/resources/views/common/items/index.blade.php
@@ -11,7 +11,7 @@
 @endsection
 
 @section('content')
-    @if ($items->count())
+    @if ($items->count() || request()->get('search', false))
         <div class="card">
             <div class="card-header border-bottom-0" :class="[{'bg-gradient-primary': bulk_action.show}]">
                 {!! Form::open([
diff --git a/resources/views/purchases/bills/index.blade.php b/resources/views/purchases/bills/index.blade.php
index 540b72cc7..a7edb7aa1 100644
--- a/resources/views/purchases/bills/index.blade.php
+++ b/resources/views/purchases/bills/index.blade.php
@@ -11,7 +11,7 @@
 @endsection
 
 @section('content')
-    @if ($bills->count())
+    @if ($bills->count() || request()->get('search', false))
         <div class="card">
             <div class="card-header border-bottom-0" :class="[{'bg-gradient-primary': bulk_action.show}]">
                 {!! Form::open([
diff --git a/resources/views/purchases/payments/index.blade.php b/resources/views/purchases/payments/index.blade.php
index 7aa451d26..a4257c373 100644
--- a/resources/views/purchases/payments/index.blade.php
+++ b/resources/views/purchases/payments/index.blade.php
@@ -11,7 +11,7 @@
 @endsection
 
 @section('content')
-    @if ($payments->count())
+    @if ($payments->count() || request()->get('search', false))
         <div class="card">
             <div class="card-header border-bottom-0" :class="[{'bg-gradient-primary': bulk_action.show}]">
                 {!! Form::open([
diff --git a/resources/views/purchases/vendors/index.blade.php b/resources/views/purchases/vendors/index.blade.php
index c1045e75b..55edcfa57 100644
--- a/resources/views/purchases/vendors/index.blade.php
+++ b/resources/views/purchases/vendors/index.blade.php
@@ -11,7 +11,7 @@
 @endsection
 
 @section('content')
-    @if ($vendors->count())
+    @if ($vendors->count() || request()->get('search', false))
         <div class="card">
             <div class="card-header border-bottom-0" :class="[{'bg-gradient-primary': bulk_action.show}]">
                 {!! Form::open([
diff --git a/resources/views/sales/customers/index.blade.php b/resources/views/sales/customers/index.blade.php
index 824341b7a..ccf02c789 100644
--- a/resources/views/sales/customers/index.blade.php
+++ b/resources/views/sales/customers/index.blade.php
@@ -11,7 +11,7 @@
 @endsection
 
 @section('content')
-    @if ($customers->count())
+    @if ($customers->count() || request()->get('search', false))
         <div class="card">
             <div class="card-header border-bottom-0" :class="[{'bg-gradient-primary': bulk_action.show}]">
                 {!! Form::open([
diff --git a/resources/views/sales/invoices/index.blade.php b/resources/views/sales/invoices/index.blade.php
index 03649eb26..91e790e10 100644
--- a/resources/views/sales/invoices/index.blade.php
+++ b/resources/views/sales/invoices/index.blade.php
@@ -11,7 +11,7 @@
 @endsection
 
 @section('content')
-    @if ($invoices->count())
+    @if ($invoices->count() || request()->get('search', false))
         <div class="card">
             <div class="card-header border-bottom-0" :class="[{'bg-gradient-primary': bulk_action.show}]">
                 {!! Form::open([
diff --git a/resources/views/sales/revenues/index.blade.php b/resources/views/sales/revenues/index.blade.php
index 42f6cab05..99e3dea97 100644
--- a/resources/views/sales/revenues/index.blade.php
+++ b/resources/views/sales/revenues/index.blade.php
@@ -11,7 +11,7 @@
 @endsection
 
 @section('content')
-    @if ($revenues->count())
+    @if ($revenues->count() || request()->get('search', false))
         <div class="card">
             <div class="card-header border-bottom-0" :class="[{'bg-gradient-primary': bulk_action.show}]">
                 {!! Form::open([
diff --git a/resources/views/settings/taxes/index.blade.php b/resources/views/settings/taxes/index.blade.php
index cbea11413..13739ec12 100644
--- a/resources/views/settings/taxes/index.blade.php
+++ b/resources/views/settings/taxes/index.blade.php
@@ -9,7 +9,7 @@
 @endcan
 
 @section('content')
-    @if ($taxes->count())
+    @if ($taxes->count() || request()->get('search', false))
         <div class="card">
             <div class="card-header border-bottom-0" :class="[{'bg-gradient-primary': bulk_action.show}]">
                 {!! Form::open([

From 86939055cd58a0217f1001b08a526769b20f526c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Mon, 9 Nov 2020 20:31:55 +0300
Subject: [PATCH 4/6] change data name

---
 resources/assets/js/components/AkauntingSearch.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/js/components/AkauntingSearch.vue b/resources/assets/js/components/AkauntingSearch.vue
index 932cfc777..d355d9579 100644
--- a/resources/assets/js/components/AkauntingSearch.vue
+++ b/resources/assets/js/components/AkauntingSearch.vue
@@ -257,7 +257,7 @@ export default {
             data.forEach(function (item) {
               this.values.push({
                 key: item.id,
-                value: item.name
+                value: (item.title) ? item.title : (item.display_name) ? item.display_name : item.name
               });
             }, this);
 

From 93a62fed4a10ab61e2c6fc2e701304d82b2fe84a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Tue, 10 Nov 2020 12:28:24 +0300
Subject: [PATCH 5/6] card header fixed.

---
 public/css/custom.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/css/custom.css b/public/css/custom.css
index 8feca3952..6421a2500 100644
--- a/public/css/custom.css
+++ b/public/css/custom.css
@@ -848,7 +848,7 @@ table .align-items-center td span.badge {
 /*--lightbox Finish--*/
 
 /*-- Search string & BulkAction Start --*/
-#app .card .card-header {
+#app > .card > .card-header {
     min-height: 88px;
 }
 /*-- Search string & BulkAction Finish --*/
\ No newline at end of file

From 2b0255b4871d690874bc9d448f6d3058cd198325 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Wed, 11 Nov 2020 14:33:49 +0300
Subject: [PATCH 6/6] search-string config check columns

---
 app/View/Components/SearchString.php          |  38 ++++-
 config/search-string.php                      |  50 ++++--
 .../assets/js/components/AkauntingSearch.vue  | 150 ++++++++++++++----
 resources/lang/en-GB/search_string.php        |   9 ++
 resources/views/auth/users/index.blade.php    |   8 +-
 .../views/components/search-string.blade.php  |  12 ++
 6 files changed, 213 insertions(+), 54 deletions(-)
 create mode 100644 resources/lang/en-GB/search_string.php

diff --git a/app/View/Components/SearchString.php b/app/View/Components/SearchString.php
index 51ef8500c..d7f615cad 100644
--- a/app/View/Components/SearchString.php
+++ b/app/View/Components/SearchString.php
@@ -4,6 +4,7 @@ namespace App\View\Components;
 
 use Illuminate\View\Component;
 use Illuminate\Support\Str;
+use Symfony\Component\Routing\Exception\RouteNotFoundException;
 
 class SearchString extends Component
 {
@@ -44,7 +45,11 @@ class SearchString extends Component
                 if (!is_array($options)) {
                     $column = $options;
                 }
-    
+                
+                if (!$this->isFilter($column, $options)) {
+                    continue;
+                }
+
                 $this->filters[] = [
                     'key' => $this->getFilterKey($column, $options),
                     'value' => $this->getFilterName($column),
@@ -58,6 +63,17 @@ class SearchString extends Component
         return view('components.search-string');
     }
 
+    protected function isFilter($column, $options)
+    {
+        $filter = true;
+    
+        if (empty($this->getFilterUrl($column, $options)) && (!isset($options['date']) && !isset($options['boolean']))) {
+            $filter = false;
+        }
+
+        return $filter;
+    }
+
     protected function getFilterKey($column, $options)
     {
         if (isset($options['relationship'])) {
@@ -71,20 +87,22 @@ class SearchString extends Component
     {
         if (strpos($column, '_id') !== false) {
             $column = str_replace('_id', '', $column);
+        } else if (strpos($column, '_code') !== false) {
+            $column = str_replace('_code', '', $column);
         }
 
         $plural = Str::plural($column, 2);
 
         if (trans_choice('general.' . $plural, 1) !== 'general.' . $plural) {
             return trans_choice('general.' . $plural, 1);
-        } elseif (trans_choice('search_string.colmuns.' . $plural, 1) !== 'search_string.colmuns.' . $plural) {
-            return trans_choice('search_string.colmuns.' . $plural, 1);
+        } elseif (trans_choice('search_string.columns.' . $plural, 1) !== 'search_string.columns.' . $plural) {
+            return trans_choice('search_string.columns.' . $plural, 1);
         }
 
         $name = trans('general.' . $column);
     
         if ($name == 'general.' . $column) {
-            $name = trans('search_string.colmuns.' . $column);
+            $name = trans('search_string.columns.' . $column);
         }
 
         return $name;
@@ -98,6 +116,10 @@ class SearchString extends Component
             $type = 'boolean';
         }
 
+        if (isset($options['date'])) {
+            $type = 'date';
+        }
+
         return $type;
     }
 
@@ -105,7 +127,7 @@ class SearchString extends Component
     {
         $url = '';
 
-        if (isset($options['boolean'])) {
+        if (isset($options['boolean']) || isset($options['date'])) {
             return $url;
         }
 
@@ -128,7 +150,11 @@ class SearchString extends Component
     
             $plural = Str::plural($column, 2);
 
-            $url = route($url . $plural . '.index');
+            try {
+                $url = route($url . $plural . '.index');
+            } catch (\Exception $e) {
+                $url = '';
+            }
         }
 
         return $url;
diff --git a/config/search-string.php b/config/search-string.php
index cf316c474..c8895694f 100644
--- a/config/search-string.php
+++ b/config/search-string.php
@@ -69,7 +69,9 @@ return [
             'number' => ['searchable' => true],
             'bank_name' => ['searchable' => true],
             'bank_address' => ['searchable' => true],
-            'currency' => ['relationship' => true],
+            'currency_code' => [
+                'route' => 'currencies.index'
+            ],
             'enabled' => ['boolean' => true],
         ],
     ],
@@ -87,16 +89,24 @@ return [
     App\Models\Banking\Transaction::class => [
         'columns' => [
             'type',
-            'account_id',
+            'account_id' => [
+                'route' => 'accounts.index'
+            ],
             'paid_at' => ['date' => true],
             'amount',
-            'currency_code',
+            'currency_code' => [
+                'route' => 'currencies.index'
+            ],
             'document_id',
-            'contact_id',
+            'contact_id' => [
+                'route' => 'customers.index'
+            ],
             'description' => ['searchable' => true],
             'payment_method',
             'reference',
-            'category_id',
+            'category_id' => [
+                'route' => 'categories.index'
+            ],
             'parent_id',
         ],
     ],
@@ -123,6 +133,8 @@ return [
             'category_id' => [
                 'route' => ['categories.index', 'search=type:item']
             ],
+            'sales_price',
+            'purchase_price',
         ],
     ],
 
@@ -135,7 +147,9 @@ return [
             'phone' => ['searchable' => true],
             'address' => ['searchable' => true],
             'website' => ['searchable' => true],
-            'currency_code',
+            'currency_code' => [
+                'route' => 'currencies.index'
+            ],
             'reference',
             'user_id',
             'enabled' => ['boolean' => true],
@@ -150,14 +164,20 @@ return [
             'billed_at' => ['date' => true],
             'due_at' => ['date' => true],
             'amount',
-            'currency_code',
-            'contact_id',
+            'currency_code' => [
+                'route' => 'currencies.index'
+            ],
+            'contact_id' => [
+                'route' => 'vendors.index'
+            ],
             'contact_name' => ['searchable' => true],
             'contact_email' => ['searchable' => true],
             'contact_tax_number',
             'contact_phone' => ['searchable' => true],
             'contact_address' => ['searchable' => true],
-            'category_id',
+            'category_id' => [
+                'route' => 'categories.index'
+            ],
             'parent_id',
         ],
     ],
@@ -170,14 +190,20 @@ return [
             'invoiced_at' => ['date' => true],
             'due_at' => ['date' => true],
             'amount',
-            'currency_code',
-            'contact_id',
+            'currency_code' => [
+                'route' => 'currencies.index'
+            ],
+            'contact_id' => [
+                'route' => 'customer.index'
+            ],
             'contact_name' => ['searchable' => true],
             'contact_email' => ['searchable' => true],
             'contact_tax_number',
             'contact_phone' => ['searchable' => true],
             'contact_address' => ['searchable' => true],
-            'category_id',
+            'category_id' => [
+                'route' => 'categories.index'
+            ],
             'parent_id',
         ],
     ],
diff --git a/resources/assets/js/components/AkauntingSearch.vue b/resources/assets/js/components/AkauntingSearch.vue
index a69b0f896..cdbe637ea 100644
--- a/resources/assets/js/components/AkauntingSearch.vue
+++ b/resources/assets/js/components/AkauntingSearch.vue
@@ -17,6 +17,7 @@
 
     <div class="dropdown input-full">
       <input
+        v-if="!show_date"
         type="text"
         class="form-control"
         :placeholder="placeholder"
@@ -27,6 +28,20 @@
         @keyup.enter="onInputConfirm"
       />
 
+      <flat-picker
+        v-else
+        @on-open="onInputFocus"
+        :config="dateConfig"
+        class="form-control datepicker"
+        :placeholder="placeholder"
+        :ref="'input-search-date-field-' + _uid"
+        v-model="search"
+        @focus="onInputFocus"
+        @input="onInputDateSelected"
+        @keyup.enter="onInputConfirm"
+      >
+      </flat-picker>
+
       <button type="button" class="btn btn-link clear" @click="onSearchAndFilterClear">
         <i class="el-tag__close el-icon-close"></i>
       </button>
@@ -62,9 +77,16 @@
 </template>
 
 <script>
+import flatPicker from "vue-flatpickr-component";
+import "flatpickr/dist/flatpickr.css";
+
 export default {
   name: 'akaunting-search',
 
+  components: {
+    flatPicker
+  },
+
   props: {
     placeholder: {
       type: String,
@@ -106,6 +128,8 @@ export default {
       default: () => [],
       description: 'List of filters'
     },
+
+    dateConfig: null,
   },
 
   model: {
@@ -131,6 +155,7 @@ export default {
       selected_values: [],
       values: [],
       current_value: null,
+      show_date: false,
     };
   },
 
@@ -140,13 +165,59 @@ export default {
         return;
       }
 
-      this.visible[this.filter_last_step] = true;
+      if (this.filter_last_step != 'values' || (this.filter_last_step == 'values' && this.selected_options[this.filter_index].type != 'date')) {
+        this.visible[this.filter_last_step] = true;
+
+        this.$nextTick(() => {
+          this.$refs['input-search-field-' + this._uid].focus();
+        });
+      } else {
+        this.show_date = true;
+
+        this.$nextTick(() => {
+          this.$refs['input-search-date-field-' + this._uid].focus();
+        });
+      }
+
+      console.log('Focus :' + this.filter_last_step);
+    },
+
+    onInputDateSelected(event) {
+      this.filtered[this.filter_index].value = event;
+
+      this.selected_values.push({
+        key: event,
+        value: event,
+      });
+
+      this.$emit('change', this.filtered);
+
+      this.show_date = false;
+      this.search = '';
 
       this.$nextTick(() => {
         this.$refs['input-search-field-' + this._uid].focus();
       });
 
-      console.log('Focus :' + this.filter_last_step);
+      this.filter_index++;
+
+      if (this.filter_list.length) {
+        this.visible = {
+          options: true,
+          operator: false,
+          values: false,
+        };
+      } else {
+        this.visible = {
+          options: false,
+          operator: false,
+          values: false,
+        };
+      }
+
+      this.show_date = false;
+
+      this.filter_last_step = 'options';
     },
 
     onInput(evt) {
@@ -158,24 +229,26 @@ export default {
         option_url += '?search=' + this.search;
       }
 
-      window.axios.get(option_url)
-      .then(response => {
-          this.values = [];
+      if (option_url) {
+        window.axios.get(option_url)
+        .then(response => {
+            this.values = [];
 
-          let data = response.data.data;
+            let data = response.data.data;
 
-          data.forEach(function (item) {
-            this.values.push({
-              key: item.id,
-              value: item.name
-            });
-          }, this);
+            data.forEach(function (item) {
+              this.values.push({
+                key: item.id,
+                value: item.name
+              });
+            }, this);
 
-          this.option_values[value] = this.values;
-      })
-      .catch(error => {
+            this.option_values[value] = this.values;
+        })
+        .catch(error => {
 
-      });
+        });
+      }
 
       this.$emit('input', evt.target.value);
     },
@@ -202,7 +275,6 @@ export default {
 
         args += this.selected_options[index].key + ':' + this.selected_values[index].key + ' ';
 
-
         serach_string[path][this.selected_options[index].key] = {
           'key': this.selected_values[index].key,
           'value': this.selected_values[index].value
@@ -218,7 +290,7 @@ export default {
       this.current_value = value;
 
       let option = false;
-      let option_url = url;
+      let option_url = false;
 
       for (let i = 0; i < this.filter_list.length; i++) {
         if (this.filter_list[i].key == value) {
@@ -249,14 +321,14 @@ export default {
 
       this.search = '';
 
-      if (!this.option_values[value]) {
+      if (!this.option_values[value] && option_url) {
         window.axios.get(option_url)
         .then(response => {
             let data = response.data.data;
 
             data.forEach(function (item) {
               this.values.push({
-                key: item.id,
+                key: (item.code) ? item.code : item.id,
                 value: (item.title) ? item.title : (item.display_name) ? item.display_name : item.name
               });
             }, this);
@@ -267,7 +339,7 @@ export default {
 
         });
       } else {
-        this.values = this.option_values[value];
+        this.values = (this.option_values[value]) ? this.option_values[value] : [];
       }
 
       this.$nextTick(() => {
@@ -288,15 +360,29 @@ export default {
 
       this.$emit('change', this.filtered);
 
-      this.$nextTick(() => {
-        this.$refs['input-search-field-' + this._uid].focus();
-      });
+      if (this.selected_options[this.filter_index].type != 'date') {
+        this.$nextTick(() => {
+          this.$refs['input-search-field-' + this._uid].focus();
+        });
 
-      this.visible = {
-        options: false,
-        operator: false,
-        values: true,
-      };
+        this.visible = {
+          options: false,
+          operator: false,
+          values: true,
+        };
+      } else {
+        this.show_date = true;
+
+        this.$nextTick(() => {
+          this.$refs['input-search-date-field-' + this._uid].focus();
+        });
+
+        this.visible = {
+          options: false,
+          operator: false,
+          values: false,
+        };
+      }
 
       this.filter_last_step = 'values';
     },
@@ -338,6 +424,8 @@ export default {
         };
       }
 
+      this.show_date = false;
+
       this.filter_last_step = 'options';
     },
 
@@ -586,4 +674,8 @@ export default {
   -webkit-box-shadow: none !important;
     box-shadow: none !important;
 }
+
+.searh-field .form-control.datepicker.flatpickr-input {
+  padding: inherit !important;
+}
 </style>
diff --git a/resources/lang/en-GB/search_string.php b/resources/lang/en-GB/search_string.php
new file mode 100644
index 000000000..c80e57706
--- /dev/null
+++ b/resources/lang/en-GB/search_string.php
@@ -0,0 +1,9 @@
+<?php
+
+return [
+
+    'columns' => [
+        'last_logged_in_at' => 'Last Login',
+    ],
+
+];
diff --git a/resources/views/auth/users/index.blade.php b/resources/views/auth/users/index.blade.php
index a5d283672..b8b958cca 100644
--- a/resources/views/auth/users/index.blade.php
+++ b/resources/views/auth/users/index.blade.php
@@ -11,18 +11,12 @@
 @section('content')
     <div class="card">
         <div class="card-header border-bottom-0" :class="[{'bg-gradient-primary': bulk_action.show}]">
-            {!! Form::open([
-                'method' => 'GET',
-                'route' => 'users.index',
-                'role' => 'form',
-                'class' => 'mb-0'
-            ]) !!}
+
                 <div class="align-items-center" v-if="!bulk_action.show">
                     <x-search-string model="App\Models\Auth\User" />
                 </div>
 
                 {{ Form::bulkActionRowGroup('general.users', $bulk_actions, ['group' => 'auth', 'type' => 'users']) }}
-            {!! Form::close() !!}
         </div>
 
         <div class="table-responsive">
diff --git a/resources/views/components/search-string.blade.php b/resources/views/components/search-string.blade.php
index fe89a5f41..eadab11df 100644
--- a/resources/views/components/search-string.blade.php
+++ b/resources/views/components/search-string.blade.php
@@ -7,4 +7,16 @@
     no-matching-data-text="{{ trans('general.no_matching_data') }}"
     value="{{ request()->get('search', null) }}"
     :filters="{{ json_encode($filters) }}"
+    :date-config="{
+        allowInput: true,
+        altInput: true,
+        altFormat: 'Y-m-d',
+        dateFormat: 'Y-m-d',
+        @if (!empty($attributes['min-date']))
+        minDate: {{ $attributes['min-date'] }}
+        @endif
+        @if (!empty($attributes['max-date']))
+        maxDate: {{ $attributes['max-date'] }}
+        @endif
+    }"
 ></akaunting-search>