|
@@ -45,7 +45,7 @@ discard block |
|
|
block discarded – undo |
|
45
|
45
|
]; |
|
46
|
46
|
|
|
47
|
47
|
// We want the field displays the date in the good format |
|
48
|
|
- $options['value'] = $this->getFormattedValueToDisplay($field, $record); |
|
|
48
|
+ $options[ 'value' ] = $this->getFormattedValueToDisplay($field, $record); |
|
49
|
49
|
|
|
50
|
50
|
return $options; |
|
51
|
51
|
} |
|
@@ -110,11 +110,11 @@ discard block |
|
|
block discarded – undo |
|
110
|
110
|
public function addConditionToSearchQuery(Builder $query, Field $field, $value) : Builder |
|
111
|
111
|
{ |
|
112
|
112
|
if (!$this->isEmptyOrNotEmptySearchQuery($query, $field, $value)) { |
|
113
|
|
- $query->where(function ($query) use($field, $value) { |
|
|
113
|
+ $query->where(function($query) use($field, $value) { |
|
114
|
114
|
if (strpos($value, ',') > -1) { |
|
115
|
115
|
$values = explode(',', $value); // Start Date, End Date |
|
116
|
|
- $dateStart = \Carbon\Carbon::createFromFormat(config('uccello.format.php.date'), trim($values[0])); |
|
117
|
|
- $dateEnd = \Carbon\Carbon::createFromFormat(config('uccello.format.php.date'), trim($values[1])); |
|
|
116
|
+ $dateStart = \Carbon\Carbon::createFromFormat(config('uccello.format.php.date'), trim($values[ 0 ])); |
|
|
117
|
+ $dateEnd = \Carbon\Carbon::createFromFormat(config('uccello.format.php.date'), trim($values[ 1 ])); |
|
118
|
118
|
} else { |
|
119
|
119
|
switch ($value) { |
|
120
|
120
|
// Today |
Please login to merge, or discard this patch.