|
@@ -167,6 +167,8 @@ class RecordINOUT extends Component
|
|
|
if ($m == 'x')
|
|
if ($m == 'x')
|
|
|
$f = str_replace("x-", "", $filter);
|
|
$f = str_replace("x-", "", $filter);
|
|
|
|
|
|
|
|
|
|
+ print $filter;
|
|
|
|
|
+
|
|
|
//$dt = $y . "-0" . $m;
|
|
//$dt = $y . "-0" . $m;
|
|
|
|
|
|
|
|
$records = \App\Models\Record::where('type', 'IN')
|
|
$records = \App\Models\Record::where('type', 'IN')
|
|
@@ -182,7 +184,7 @@ class RecordINOUT extends Component
|
|
|
/*->where(function ($query) use ($f, $dt) {
|
|
/*->where(function ($query) use ($f, $dt) {
|
|
|
$query->where('records.date', 'like', '%' . $dt . '%')->orWhere('records_rows.when', 'like', '%' . $f . '%');
|
|
$query->where('records.date', 'like', '%' . $dt . '%')->orWhere('records_rows.when', 'like', '%' . $f . '%');
|
|
|
})*/
|
|
})*/
|
|
|
- ->where('records_rows.when', 'like', '%' . $f . '%')
|
|
|
|
|
|
|
+ ->where('records_rows.when', 'like', '%"' . $f . '"%')
|
|
|
->get();
|
|
->get();
|
|
|
//$records = $records->orderBy('date', 'DESC')->get();
|
|
//$records = $records->orderBy('date', 'DESC')->get();
|
|
|
|
|
|
|
@@ -215,7 +217,7 @@ class RecordINOUT extends Component
|
|
|
$query->where('financial_movement', false)->orWhere('financial_movement', null);
|
|
$query->where('financial_movement', false)->orWhere('financial_movement', null);
|
|
|
})
|
|
})
|
|
|
->whereNotIn('member_id', $exclude_from_records)
|
|
->whereNotIn('member_id', $exclude_from_records)
|
|
|
- ->where('records_rows.when', 'like', '%' . $f . '%')->get();
|
|
|
|
|
|
|
+ ->where('records_rows.when', 'like', '%"' . $f . '"%')->get();
|
|
|
//$records = $records->orderBy('date', 'DESC')->get();
|
|
//$records = $records->orderBy('date', 'DESC')->get();
|
|
|
|
|
|
|
|
foreach($records as $record)
|
|
foreach($records as $record)
|
|
@@ -458,7 +460,7 @@ class RecordINOUT extends Component
|
|
|
$query->where('financial_movement', false)->orWhere('financial_movement', null);
|
|
$query->where('financial_movement', false)->orWhere('financial_movement', null);
|
|
|
})
|
|
})
|
|
|
->whereNotIn('member_id', $exclude_from_records)
|
|
->whereNotIn('member_id', $exclude_from_records)
|
|
|
- ->where('records_rows.when', 'like', '%' . $filter . '%')->get();
|
|
|
|
|
|
|
+ ->where('records_rows.when', 'like', '%"' . $filter . '"%')->get();
|
|
|
//$records = $records->orderBy('date', 'DESC')->get();
|
|
//$records = $records->orderBy('date', 'DESC')->get();
|
|
|
|
|
|
|
|
foreach($records as $record)
|
|
foreach($records as $record)
|
|
@@ -490,7 +492,7 @@ class RecordINOUT extends Component
|
|
|
$query->where('financial_movement', false)->orWhere('financial_movement', null);
|
|
$query->where('financial_movement', false)->orWhere('financial_movement', null);
|
|
|
})
|
|
})
|
|
|
->whereNotIn('member_id', $exclude_from_records)
|
|
->whereNotIn('member_id', $exclude_from_records)
|
|
|
- ->where('records_rows.when', 'like', '%' . $filter . '%')->get();
|
|
|
|
|
|
|
+ ->where('records_rows.when', 'like', '%"' . $filter . '"%')->get();
|
|
|
//$records = $records->orderBy('date', 'DESC')->get();
|
|
//$records = $records->orderBy('date', 'DESC')->get();
|
|
|
|
|
|
|
|
foreach($records as $record)
|
|
foreach($records as $record)
|
Luca Parisio