diff --git a/client/ticket/src/index/index.html b/client/ticket/src/index/index.html
index 971dab93e..a8f415767 100644
--- a/client/ticket/src/index/index.html
+++ b/client/ticket/src/index/index.html
@@ -22,17 +22,17 @@
Id
- Salesperson
+ Salesperson
Date
Hour
Alias
- Province
- State
- Agency
- Warehouse
+ Province
+ State
+ Agency
+ Warehouse
Invoice
Route
- Total
+ Total
diff --git a/services/loopback/common/methods/ticket/filter.js b/services/loopback/common/methods/ticket/filter.js
index ec2da5895..61a63938f 100644
--- a/services/loopback/common/methods/ticket/filter.js
+++ b/services/loopback/common/methods/ticket/filter.js
@@ -62,7 +62,7 @@ module.exports = Self => {
}, {
arg: 'myTeam',
type: 'Boolean',
- description: `Whether to show only tickets for the current logged user team (Ignored until implemented)`
+ description: `Whether to show only tickets for the current logged user team (For now it shows only the current user tickets)`
}
],
returns: {
@@ -78,7 +78,6 @@ module.exports = Self => {
Self.filter = async (ctx, filter) => {
let conn = Self.dataSource.connector;
- // TODO: Using the current worker id until WorkerTeam model is created
let worker = await Self.app.models.Worker.findOne({
fields: ['id'],
where: {userFk: ctx.req.accessToken.userId}
@@ -131,12 +130,8 @@ module.exports = Self => {
t.nickname,
t.refFk,
t.routeFk,
- t.agencyModeFk,
t.warehouseFk,
t.clientFk,
- c.salesPersonFk,
- a.provinceFk,
- ts.stateFk,
p.name AS province,
w.name AS warehouse,
am.name AS agencyMode,