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 @@ - {{ filter.operator }} + {{ (filter.operator == '=') ? operatorIsText : operatorIsNotText }} @@ -31,7 +31,7 @@ -