Skip to content

fix: search via user email in order table #5259

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 7, 2020
Merged

fix: search via user email in order table #5259

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5dbf877
search via mail in table
maze-runnar Oct 7, 2020
1cea18a
making clear
maze-runnar Oct 7, 2020
ee653ea
clearer
maze-runnar Oct 7, 2020
d5e3a2b
shortening code
maze-runnar Oct 7, 2020
d21d346
working..
maze-runnar Oct 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 34 additions & 3 deletions app/routes/events/view/tickets/orders/list.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,49 @@ export default class extends Route.extend(EmberTableRouteMixin) {

async model(params) {
this.set('params', params);
const searchField = 'identifier';
let filterOptions = [];
if (params.orders_status !== 'all') {
if (params.orders_status !== 'all' && params.search !== null) {
filterOptions = [
{
and: [
{
name : 'status',
op : 'eq',
val : params.orders_status
},
{
name : 'user',
op : 'has',
val : {
name : 'email',
op : 'ilike',
val : `%${params.search}%`
}
}
]
}
];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just push in search options if search is present. No need to create 2 more conditions like this. See the implementation of applySearchFilters

} else if (params.orders_status !== 'all') {
filterOptions = [
{
name : 'status',
op : 'eq',
val : params.orders_status
}
];
} else if (params.search !== null) {
filterOptions = [
{
name : 'user',
op : 'has',
val : {
name : 'email',
op : 'ilike',
val : `%${params.search}%`
}
}
];
}
filterOptions = this.applySearchFilters(filterOptions, params, searchField);

let queryString = {
include : 'tickets,user',
Expand Down