verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

cr changes

This commit is contained in:
Bernat Exposito Domenech 2020-07-09 11:21:06 +02:00
parent 7d6ac265b4
commit b2e3ebc262
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/order/back/methods/order/filter.js
View File

@ -177,7 +177,6 @@ module.exports = Self => {
}); });
} }
// stmt.merge(conn.makeSuffix(filter));
stmt.merge(conn.makeWhere(filter.where)); stmt.merge(conn.makeWhere(filter.where));
stmt.merge({ stmt.merge({
sql: `GROUP BY o.id` sql: `GROUP BY o.id`

2
modules/order/front/summary/index.js
View File

@ -23,7 +23,7 @@ class Controller extends Section {
} }
save() { save() {
this.$http.post(`Orders/${this.$params.id}/confirm`).then(() => { this.$http.post(`Orders/${this.order.id}/confirm`).then(() => {
this.vnApp.showSuccess(this.$t('Order confirmed')); this.vnApp.showSuccess(this.$t('Order confirmed'));
this.$state.go(`ticket.index`, { this.$state.go(`ticket.index`, {
q: JSON.stringify({clientFk: this.order.clientFk}) q: JSON.stringify({clientFk: this.order.clientFk})