diff --git a/modules/order/back/methods/order/filter.js b/modules/order/back/methods/order/filter.js
index 27cacdd620..008c0e5c95 100644
--- a/modules/order/back/methods/order/filter.js
+++ b/modules/order/back/methods/order/filter.js
@@ -18,7 +18,7 @@ module.exports = Self => {
}, {
arg: 'search',
type: 'string',
- description: `If it's and integer searchs by id, otherwise it searchs by nickname`
+ description: `The general search by ticket id or nickname`
}, {
arg: 'from',
type: 'date',
@@ -36,9 +36,9 @@ module.exports = Self => {
type: 'integer',
description: 'The client id'
}, {
- arg: 'ticketFk',
+ arg: 'orderFk',
type: 'integer',
- description: 'The ticket id'
+ description: 'The order id'
}, {
arg: 'agencyModeFk',
type: 'integer',
@@ -103,7 +103,7 @@ module.exports = Self => {
switch (param) {
case 'search':
return /^\d+$/.test(value)
- ? {'o.id': value}
+ ? {'t.id': value}
: {or: [
{'c.name': {like: `%${value}%`}}
]};
@@ -119,8 +119,8 @@ module.exports = Self => {
return {'o.agency_id': value};
case 'sourceApp':
return {'o.source_app': value};
- case 'ticketFk':
- return {'ot.ticketFk': value};
+ case 'orderFk':
+ return {'o.id': value};
case 'isConfirmed':
return {'o.confirmed': value ? 1 : 0};
case 'myTeam':
@@ -131,7 +131,7 @@ module.exports = Self => {
case 'showEmpty':
return {'o.total': {neq: value}};
case 'id':
- param = `o.${param}`;
+ param = `t.${param}`;
return {[param]: value};
}
});
diff --git a/modules/order/front/main/index.html b/modules/order/front/main/index.html
index f3b72adb2a..1f6c7434c8 100644
--- a/modules/order/front/main/index.html
+++ b/modules/order/front/main/index.html
@@ -9,7 +9,7 @@
diff --git a/modules/order/front/search-panel/index.html b/modules/order/front/search-panel/index.html
index c622dd1523..a3ed9e5a5b 100644
--- a/modules/order/front/search-panel/index.html
+++ b/modules/order/front/search-panel/index.html
@@ -5,7 +5,7 @@
vn-one
label="General search"
ng-model="filter.search"
- info="Search orders by id"
+ info="Search orders by ticket id"
vn-focus>
@@ -51,8 +51,8 @@
+ label="Order id"
+ ng-model="filter.orderFk">