Merge pull request 'Added updated from in sticker master resource page' (#541) from ranjith-dev into master
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Has been cancelled
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Has been cancelled
Reviewed-on: #541
This commit was merged in pull request #541.
This commit is contained in:
@@ -780,13 +780,23 @@ class StickerMasterResource extends Resource
|
|||||||
->placeholder(placeholder: 'Select To DateTime')
|
->placeholder(placeholder: 'Select To DateTime')
|
||||||
->reactive()
|
->reactive()
|
||||||
->native(false),
|
->native(false),
|
||||||
|
DateTimePicker::make(name: 'updated_from')
|
||||||
|
->label('Updated From')
|
||||||
|
->placeholder(placeholder: 'Select From DateTime')
|
||||||
|
->reactive()
|
||||||
|
->native(false),
|
||||||
|
DateTimePicker::make('updated_to')
|
||||||
|
->label('Updated To')
|
||||||
|
->placeholder(placeholder: 'Select To DateTime')
|
||||||
|
->reactive()
|
||||||
|
->native(false),
|
||||||
TextInput::make('updated_by')
|
TextInput::make('updated_by')
|
||||||
->label('Updated By')
|
->label('Updated By')
|
||||||
->placeholder(placeholder: 'Enter Updated By Name'),
|
->placeholder(placeholder: 'Enter Updated By Name'),
|
||||||
])
|
])
|
||||||
->query(function ($query, array $data) {
|
->query(function ($query, array $data) {
|
||||||
// Hide all records initially if no filters are applied
|
// Hide all records initially if no filters are applied
|
||||||
if (empty($data['Plant']) && empty($data['item_id']) && empty($data['material_type']) && empty($data['panel_box_code']) && empty($data['created_from']) && empty($data['created_to']) && empty($data['created_by']) && empty($data['updated_by'])) {
|
if (empty($data['Plant']) && empty($data['item_id']) && empty($data['material_type']) && empty($data['panel_box_code']) && empty($data['created_from']) && empty($data['created_to']) && empty($data['updated_from']) && empty($data['updated_to']) && empty($data['created_by']) && empty($data['updated_by'])) {
|
||||||
return $query->whereRaw('1 = 0');
|
return $query->whereRaw('1 = 0');
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -824,6 +834,14 @@ class StickerMasterResource extends Resource
|
|||||||
$query->where('created_at', '<=', $data['created_to']);
|
$query->where('created_at', '<=', $data['created_to']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (! empty($data['updated_from'])) {
|
||||||
|
$query->where('updated_at', '>=', $data['updated_from']);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (! empty($data['updated_to'])) {
|
||||||
|
$query->where('updated_at', '<=', $data['updated_to']);
|
||||||
|
}
|
||||||
|
|
||||||
if (! empty($data['updated_by'])) {
|
if (! empty($data['updated_by'])) {
|
||||||
$query->where('updated_by', 'like', '%'.$data['updated_by'].'%');
|
$query->where('updated_by', 'like', '%'.$data['updated_by'].'%');
|
||||||
}
|
}
|
||||||
@@ -872,6 +890,14 @@ class StickerMasterResource extends Resource
|
|||||||
$indicators[] = 'To: '.$data['created_to'];
|
$indicators[] = 'To: '.$data['created_to'];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (! empty($data['updated_from'])) {
|
||||||
|
$indicators[] = 'From: '.$data['updated_from'];
|
||||||
|
}
|
||||||
|
|
||||||
|
if (! empty($data['updated_to'])) {
|
||||||
|
$indicators[] = 'To: '.$data['updated_to'];
|
||||||
|
}
|
||||||
|
|
||||||
if (! empty($data['updated_by'])) {
|
if (! empty($data['updated_by'])) {
|
||||||
$indicators[] = 'Updated By: '.$data['updated_by'];
|
$indicators[] = 'Updated By: '.$data['updated_by'];
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user