Merge pull request #1889 from SevanNerse/search-string
it should parse date-related parameters
This commit is contained in:
commit
1677a930ac
@ -7,8 +7,9 @@ trait SearchString
|
|||||||
/**
|
/**
|
||||||
* Get the value of a name in search string
|
* Get the value of a name in search string
|
||||||
* Example: search=type:customer year:2020 account_id:20
|
* Example: search=type:customer year:2020 account_id:20
|
||||||
|
* Example: issued_at>=2021-02-01 issued_at<=2021-02-10 account_id:49
|
||||||
*
|
*
|
||||||
* @return string
|
* @return string|array
|
||||||
*/
|
*/
|
||||||
public function getSearchStringValue($name, $default = '', $input = null)
|
public function getSearchStringValue($name, $default = '', $input = null)
|
||||||
{
|
{
|
||||||
@ -18,23 +19,31 @@ trait SearchString
|
|||||||
$input = request('search');
|
$input = request('search');
|
||||||
}
|
}
|
||||||
|
|
||||||
//$manager = $this->getSearchStringManager();
|
// $manager = $this->getSearchStringManager();
|
||||||
//$parsed = $manager->parse($input);
|
// $parsed = $manager->parse($input);
|
||||||
|
|
||||||
$columns = explode(' ', $input);
|
$columns = explode(' ', $input);
|
||||||
|
|
||||||
foreach ($columns as $column) {
|
foreach ($columns as $column) {
|
||||||
$variable = explode(':', $column);
|
$variable = preg_split('/:|>?<?=/', $column);
|
||||||
|
|
||||||
if (empty($variable[0]) || ($variable[0] != $name) || empty($variable[1])) {
|
if (empty($variable[0]) || ($variable[0] != $name) || empty($variable[1])) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (strpos($column, ':')) {
|
||||||
$value = $variable[1];
|
$value = $variable[1];
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!is_array($value)) {
|
||||||
|
$value = [];
|
||||||
|
}
|
||||||
|
|
||||||
|
$value[] = $variable[1];
|
||||||
|
}
|
||||||
|
|
||||||
return $value;
|
return $value;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user