From 5dbf877648a64f1ae64c620654bc248dc83a0e2f Mon Sep 17 00:00:00 2001 From: sundaram Date: Wed, 7 Oct 2020 11:59:43 +0530 Subject: [PATCH 1/5] search via mail in table --- app/routes/events/view/tickets/orders/list.js | 37 +++++++++++++++++-- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/app/routes/events/view/tickets/orders/list.js b/app/routes/events/view/tickets/orders/list.js index d112a923976..b545571100c 100644 --- a/app/routes/events/view/tickets/orders/list.js +++ b/app/routes/events/view/tickets/orders/list.js @@ -19,9 +19,29 @@ 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}%` + } + } + ] + } + ]; + } else if (params.orders_status !== 'all') { filterOptions = [ { name : 'status', @@ -29,8 +49,19 @@ export default class extends Route.extend(EmberTableRouteMixin) { 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', From 1cea18aa829937b8a154144d744f41b30a81ffdc Mon Sep 17 00:00:00 2001 From: sundaram Date: Wed, 7 Oct 2020 17:17:00 +0530 Subject: [PATCH 2/5] making clear --- app/routes/events/view/tickets/orders/list.js | 64 ++++++++----------- 1 file changed, 25 insertions(+), 39 deletions(-) diff --git a/app/routes/events/view/tickets/orders/list.js b/app/routes/events/view/tickets/orders/list.js index b545571100c..6d397abd0a2 100644 --- a/app/routes/events/view/tickets/orders/list.js +++ b/app/routes/events/view/tickets/orders/list.js @@ -20,47 +20,33 @@ export default class extends Route.extend(EmberTableRouteMixin) { async model(params) { this.set('params', params); let filterOptions = []; - 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}%` - } - } - ] + if (params.search) { + filterOptions.pushObject({ + name : 'user', + op : 'has', + val : { + name : 'email', + op : 'ilike', + val : `%${params.search}%` } - ]; - } else if (params.orders_status !== 'all') { - filterOptions = [ - { - name : 'status', - op : 'eq', - val : params.orders_status + }); + } else { + filterOptions.removeObject({ + name : 'user', + op : 'has', + val : { + name : 'email', + op : 'ilike', + val : `%${params.search}%` } - ]; - } else if (params.search !== null) { - filterOptions = [ - { - name : 'user', - op : 'has', - val : { - name : 'email', - op : 'ilike', - val : `%${params.search}%` - } - } - ]; + }); + } + if (params.orders_status !== 'all') { + filterOptions.pushObject({ + name : 'status', + op : 'eq', + val : params.orders_status + }); } let queryString = { From ee653eae2d17e10fa59f6d0ce2f4d9d0b0bdf4cf Mon Sep 17 00:00:00 2001 From: sundaram Date: Wed, 7 Oct 2020 17:20:23 +0530 Subject: [PATCH 3/5] clearer --- app/routes/events/view/tickets/orders/list.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/routes/events/view/tickets/orders/list.js b/app/routes/events/view/tickets/orders/list.js index 6d397abd0a2..53f23441197 100644 --- a/app/routes/events/view/tickets/orders/list.js +++ b/app/routes/events/view/tickets/orders/list.js @@ -19,7 +19,7 @@ export default class extends Route.extend(EmberTableRouteMixin) { async model(params) { this.set('params', params); - let filterOptions = []; + const filterOptions = []; if (params.search) { filterOptions.pushObject({ name : 'user', From d5e3a2b7a36d8a4448802af3bda5f9a7d09964fb Mon Sep 17 00:00:00 2001 From: sundaram Date: Wed, 7 Oct 2020 19:43:06 +0530 Subject: [PATCH 4/5] shortening code --- app/routes/events/view/tickets/orders/list.js | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/app/routes/events/view/tickets/orders/list.js b/app/routes/events/view/tickets/orders/list.js index 53f23441197..77ecc42fdf7 100644 --- a/app/routes/events/view/tickets/orders/list.js +++ b/app/routes/events/view/tickets/orders/list.js @@ -30,17 +30,7 @@ export default class extends Route.extend(EmberTableRouteMixin) { val : `%${params.search}%` } }); - } else { - filterOptions.removeObject({ - name : 'user', - op : 'has', - val : { - name : 'email', - op : 'ilike', - val : `%${params.search}%` - } - }); - } + } if (params.orders_status !== 'all') { filterOptions.pushObject({ name : 'status', @@ -60,4 +50,4 @@ export default class extends Route.extend(EmberTableRouteMixin) { return this.asArray(this.modelFor('events.view').query('orders', queryString)); } -} +} \ No newline at end of file From d21d34641a74e75b237c14aeb9bdfcea57f1af11 Mon Sep 17 00:00:00 2001 From: sundaram Date: Wed, 7 Oct 2020 19:46:22 +0530 Subject: [PATCH 5/5] working.. --- app/routes/events/view/tickets/orders/list.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/routes/events/view/tickets/orders/list.js b/app/routes/events/view/tickets/orders/list.js index 77ecc42fdf7..77dde1af4fb 100644 --- a/app/routes/events/view/tickets/orders/list.js +++ b/app/routes/events/view/tickets/orders/list.js @@ -30,7 +30,7 @@ export default class extends Route.extend(EmberTableRouteMixin) { val : `%${params.search}%` } }); - } + } if (params.orders_status !== 'all') { filterOptions.pushObject({ name : 'status', @@ -50,4 +50,4 @@ export default class extends Route.extend(EmberTableRouteMixin) { return this.asArray(this.modelFor('events.view').query('orders', queryString)); } -} \ No newline at end of file +}