diff --git a/front/core/components/table/index.js b/front/core/components/table/index.js index 81eff872c..f795ca971 100644 --- a/front/core/components/table/index.js +++ b/front/core/components/table/index.js @@ -27,13 +27,6 @@ export default class Table { return this.table.classList.contains('scrollable'); } - $postLink() { - if (this.isScrollable()) { - const childCells = this.table.querySelector('vn-tbody'); - console.log(childCells); - } - } - setActiveArrow() { let columns = this.table.querySelectorAll('vn-thead vn-th'); columns.forEach(column => { diff --git a/modules/monitor/back/methods/sales-monitor/ordersFilter.js b/modules/monitor/back/methods/sales-monitor/ordersFilter.js index 8c945a4c6..bc9ab3bdf 100644 --- a/modules/monitor/back/methods/sales-monitor/ordersFilter.js +++ b/modules/monitor/back/methods/sales-monitor/ordersFilter.js @@ -61,7 +61,7 @@ module.exports = Self => { stmt.merge(conn.makeWhere(filter.where)); stmt.merge(conn.makeGroupBy('o.id')); - stmt.merge(conn.makeLimit(filter)); + stmt.merge(conn.makePagination(filter)); return conn.executeStmt(stmt); }; diff --git a/modules/monitor/front/index/orders/index.html b/modules/monitor/front/index/orders/index.html index 293b1fd8c..9bb4d3608 100644 --- a/modules/monitor/front/index/orders/index.html +++ b/modules/monitor/front/index/orders/index.html @@ -1,8 +1,8 @@ - + order="date_make DESC"> @@ -20,7 +20,7 @@ - Date + Date Client Import