diff --git a/modules/order/back/methods/order/filter.js b/modules/order/back/methods/order/filter.js index e5d18b44a..1d9fe37ae 100644 --- a/modules/order/back/methods/order/filter.js +++ b/modules/order/back/methods/order/filter.js @@ -150,10 +150,7 @@ module.exports = Self => { stmts.push(` DROP TEMPORARY TABLE tmp.order, - tmp.orderTotal`); - - stmts.push( - `DROP TEMPORARY TABLE + tmp.orderTotal, tmp.filter`); let sql = ParameterizedSQL.join(stmts, ';'); diff --git a/modules/order/front/index/index.html b/modules/order/front/index/index.html index 0fd53f2f6..dc3c54fdf 100644 --- a/modules/order/front/index/index.html +++ b/modules/order/front/index/index.html @@ -3,6 +3,7 @@ url="/api/Orders/filter" limit="20" data="orders" + order="landed DESC, clientFk" auto-load="false">
@@ -22,15 +23,15 @@ auto-load="false"> - Id + Id Client Sales person Confirmed Created from Created - Landed + Landed Company - Total + Total diff --git a/modules/order/front/summary/index.html b/modules/order/front/summary/index.html index e46537f49..66cc6ec65 100644 --- a/modules/order/front/summary/index.html +++ b/modules/order/front/summary/index.html @@ -8,19 +8,20 @@ - - + + + {{$ctrl.summary.isConfirmed}} + value="{{$ctrl.summary.confirmed | dateTime: 'dd/MM/yyyy HH:mm'}}"> diff --git a/modules/ticket/front/index/index.html b/modules/ticket/front/index/index.html index 7cfbbf244..f43b90f59 100644 --- a/modules/ticket/front/index/index.html +++ b/modules/ticket/front/index/index.html @@ -3,7 +3,7 @@ url="/ticket/api/Tickets/filter" limit="20" data="tickets" - order="shipped ASC, clientFk" + order="shipped DESC, clientFk" auto-load="false">
@@ -42,14 +42,14 @@ Id Salesperson - Date + Date Hour Alias Province State Agency Warehouse - Invoice + Invoice Total diff --git a/modules/ticket/front/index/index.js b/modules/ticket/front/index/index.js index d88662604..c616120df 100644 --- a/modules/ticket/front/index/index.js +++ b/modules/ticket/front/index/index.js @@ -61,11 +61,6 @@ export default class Controller { this.daysOnward = buildDate; } - defaultFilter() { - this.buildFilterDates(); - this.$scope.ticketSearchbar.filter = Object.assign({}, {mine: true, from: this.today, to: this.daysOnward}); - } - onSearch(params) { if (params) { if (params.scopeDays) {