From f0e4ec65b4ec62427cd0bea71c20780e9d98388b Mon Sep 17 00:00:00 2001 From: Sevan Nerse Date: Wed, 24 Feb 2021 14:35:16 +0300 Subject: [PATCH] it should parse date-related parameters --- app/Traits/SearchString.php | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/app/Traits/SearchString.php b/app/Traits/SearchString.php index 6fb508e7f..1acded948 100644 --- a/app/Traits/SearchString.php +++ b/app/Traits/SearchString.php @@ -7,8 +7,9 @@ trait SearchString /** * Get the value of a name in search string * 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) { @@ -18,21 +19,29 @@ trait SearchString $input = request('search'); } - //$manager = $this->getSearchStringManager(); - //$parsed = $manager->parse($input); + // $manager = $this->getSearchStringManager(); + // $parsed = $manager->parse($input); $columns = explode(' ', $input); foreach ($columns as $column) { - $variable = explode(':', $column); + $variable = preg_split('/:|>?