From a7f059e5db8a84ca4be8df884488b6143311f0fe Mon Sep 17 00:00:00 2001 From: Schin Chauhan Date: Tue, 3 Aug 2021 17:23:35 +0530 Subject: [PATCH 1/3] apply sorting in sales --- app/controllers/admin/sales/index.js | 2 +- app/models/admin-sales-by-event.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/admin/sales/index.js b/app/controllers/admin/sales/index.js index 1df3e893c12..410d2c13a33 100644 --- a/app/controllers/admin/sales/index.js +++ b/app/controllers/admin/sales/index.js @@ -6,7 +6,7 @@ import EmberTableControllerMixin from 'open-event-frontend/mixins/ember-table-co export default class IndexController extends Controller.extend(AdminSalesMixin, EmberTableControllerMixin) { @or('authManager.currentUser.isSuperAdmin', 'authManager.currentUser.isAdmin') hasRestorePrivileges; -sort_by = 'starts-at'; +sort_by = 'rough-sales'; sort_dir = 'DSC'; get columns() { return [ diff --git a/app/models/admin-sales-by-event.js b/app/models/admin-sales-by-event.js index fc50eb235ef..a0fadf4d0fd 100644 --- a/app/models/admin-sales-by-event.js +++ b/app/models/admin-sales-by-event.js @@ -8,6 +8,7 @@ export default ModelBase.extend({ endsAt : attr('moment'), startsAt : attr('moment'), paymentCurrency : attr('string'), + roughSales : attr('number'), sales : attr(), ownerId : attr() }); From 4e66224d14e22f70d48b886c9d632cd7658ec028 Mon Sep 17 00:00:00 2001 From: Schin Chauhan Date: Thu, 5 Aug 2021 17:36:50 +0530 Subject: [PATCH 2/3] change name of field --- app/controllers/admin/sales/index.js | 3 ++- app/models/admin-sales-by-event.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controllers/admin/sales/index.js b/app/controllers/admin/sales/index.js index 410d2c13a33..34d4f090021 100644 --- a/app/controllers/admin/sales/index.js +++ b/app/controllers/admin/sales/index.js @@ -6,8 +6,9 @@ import EmberTableControllerMixin from 'open-event-frontend/mixins/ember-table-co export default class IndexController extends Controller.extend(AdminSalesMixin, EmberTableControllerMixin) { @or('authManager.currentUser.isSuperAdmin', 'authManager.currentUser.isAdmin') hasRestorePrivileges; -sort_by = 'rough-sales'; +sort_by = 'total-sales'; sort_dir = 'DSC'; +per_page = 10; get columns() { return [ { diff --git a/app/models/admin-sales-by-event.js b/app/models/admin-sales-by-event.js index a0fadf4d0fd..c69ae523bdb 100644 --- a/app/models/admin-sales-by-event.js +++ b/app/models/admin-sales-by-event.js @@ -8,7 +8,7 @@ export default ModelBase.extend({ endsAt : attr('moment'), startsAt : attr('moment'), paymentCurrency : attr('string'), - roughSales : attr('number'), + totalSales : attr('number'), sales : attr(), ownerId : attr() }); From 46d83240f59729aa2175bfdf77229324a0a65d27 Mon Sep 17 00:00:00 2001 From: Sachin Chauhan Date: Mon, 9 Aug 2021 10:45:09 +0530 Subject: [PATCH 3/3] restructure --- app/controllers/admin/sales/index.js | 38 ++++++++++++++++++---------- app/models/admin-sales-by-event.js | 23 ++++++++++------- 2 files changed, 39 insertions(+), 22 deletions(-) diff --git a/app/controllers/admin/sales/index.js b/app/controllers/admin/sales/index.js index 34d4f090021..8a879b56fc1 100644 --- a/app/controllers/admin/sales/index.js +++ b/app/controllers/admin/sales/index.js @@ -6,7 +6,7 @@ import EmberTableControllerMixin from 'open-event-frontend/mixins/ember-table-co export default class IndexController extends Controller.extend(AdminSalesMixin, EmberTableControllerMixin) { @or('authManager.currentUser.isSuperAdmin', 'authManager.currentUser.isAdmin') hasRestorePrivileges; -sort_by = 'total-sales'; +// sort_by = 'total-sales'; sort_dir = 'DSC'; per_page = 10; get columns() { @@ -45,14 +45,18 @@ get columns() { color : 'green', subcolumns : [ { - name : this.l10n.t('Tickets'), - valuePath : 'sales.completed.ticket_count', - width : 30 + name : this.l10n.t('Tickets'), + valuePath : 'completedOrderTickets', + headerComponent : 'tables/headers/sort', + isSortable : true, + width : 30 }, { name : this.l10n.t('Sales'), - valuePath : 'sales.completed.sales_total', + valuePath : 'completedOrderSales', extraValuePaths : ['paymentCurrency'], + headerComponent : 'tables/headers/sort', + isSortable : true, cellComponent : 'ui-table/cell/admin/sales/cell-amount' } ] @@ -63,13 +67,17 @@ get columns() { headerComponent : 'tables/headers/sort', subcolumns : [ { - name : this.l10n.t('Tickets'), - valuePath : 'sales.placed.ticket_count', - width : 30 + name : this.l10n.t('Tickets'), + valuePath : 'placedOrderTickets', + headerComponent : 'tables/headers/sort', + isSortable : true, + width : 30 }, { name : this.l10n.t('Sales'), - valuePath : 'sales.placed.sales_total', + valuePath : 'placedOrderSales', + headerComponent : 'tables/headers/sort', + isSortable : true, extraValuePaths : ['paymentCurrency'], cellComponent : 'ui-table/cell/admin/sales/cell-amount' } @@ -81,13 +89,17 @@ get columns() { headerComponent : 'tables/headers/sort', subcolumns : [ { - name : this.l10n.t('Tickets'), - valuePath : 'sales.pending.ticket_count', - width : 30 + name : this.l10n.t('Tickets'), + valuePath : 'pendingOrderTickets', + headerComponent : 'tables/headers/sort', + isSortable : true, + width : 30 }, { name : this.l10n.t('Sales'), - valuePath : 'sales.pending.sales_total', + valuePath : 'pendingOrderSales', + headerComponent : 'tables/headers/sort', + isSortable : true, extraValuePaths : ['paymentCurrency'], cellComponent : 'ui-table/cell/admin/sales/cell-amount' } diff --git a/app/models/admin-sales-by-event.js b/app/models/admin-sales-by-event.js index c69ae523bdb..d8748bedd10 100644 --- a/app/models/admin-sales-by-event.js +++ b/app/models/admin-sales-by-event.js @@ -2,13 +2,18 @@ import attr from 'ember-data/attr'; import ModelBase from 'open-event-frontend/models/base'; export default ModelBase.extend({ - name : attr('string'), - owner : attr(), - type : attr(), - endsAt : attr('moment'), - startsAt : attr('moment'), - paymentCurrency : attr('string'), - totalSales : attr('number'), - sales : attr(), - ownerId : attr() + name : attr('string'), + owner : attr(), + type : attr(), + endsAt : attr('moment'), + startsAt : attr('moment'), + paymentCurrency : attr('string'), + completedOrderSales : attr('number'), + placedOrderSales : attr('number'), + pendingOrderSales : attr('number'), + completedOrderTickets : attr('number'), + placedOrderTickets : attr('number'), + pendingOrderTickets : attr('number'), + sales : attr(), + ownerId : attr() });