From e11c0936bce42d21f8e592fa29aac20639b77bd5 Mon Sep 17 00:00:00 2001 From: Carlos Jimenez <=> Date: Tue, 24 Apr 2018 12:46:07 +0200 Subject: [PATCH] eslint errors corrected --- .../loopback/common/methods/item/filter.js | 1 - services/loopback/common/models/sale.json | 116 +++++++++--------- .../ticket/common/models/saleComponent.json | 40 +++--- 3 files changed, 78 insertions(+), 79 deletions(-) diff --git a/services/loopback/common/methods/item/filter.js b/services/loopback/common/methods/item/filter.js index cda4bda81d..72720ef459 100644 --- a/services/loopback/common/methods/item/filter.js +++ b/services/loopback/common/methods/item/filter.js @@ -51,7 +51,6 @@ module.exports = Self => { } } ); - return filter; } }; diff --git a/services/loopback/common/models/sale.json b/services/loopback/common/models/sale.json index 9466549dac..cc2569b899 100644 --- a/services/loopback/common/models/sale.json +++ b/services/loopback/common/models/sale.json @@ -1,61 +1,61 @@ { - "name": "Sale", - "base": "VnModel", - "options": { - "mysql": { - "table": "sale" + "name": "Sale", + "base": "VnModel", + "options": { + "mysql": { + "table": "sale" + } + }, + "properties": { + "id": { + "id": true, + "type": "Number", + "description": "Identifier" + }, + "concept": { + "type": "String" + }, + "quantity": { + "type": "Number" + }, + "price": { + "type": "Number" + }, + "discount": { + "type": "Number" + }, + "reserved": { + "type": "Number" + }, + "isPicked": { + "type": "Number" + }, + "created": { + "type": "date" + } + }, + "relations": { + "item": { + "type": "belongsTo", + "model": "Item", + "foreignKey": "itemFk", + "required": true + }, + "ticket": { + "type": "belongsTo", + "model": "Ticket", + "foreignKey": "ticketFk", + "required": true + }, + "isChecked": { + "type": "hasOne", + "model": "SaleChecked", + "foreignKey": "saleFk" + }, + "components": { + "type": "hasMany", + "model": "SaleComponent", + "foreignKey": "saleFk" + } } - }, - "properties": { - "id": { - "id": true, - "type": "Number", - "description": "Identifier" - }, - "concept": { - "type": "String" - }, - "quantity": { - "type": "Number" - }, - "price": { - "type": "Number" - }, - "discount": { - "type": "Number" - }, - "reserved": { - "type": "Number" - }, - "isPicked": { - "type": "Number" - }, - "created": { - "type": "date" - } - }, - "relations": { - "item": { - "type": "belongsTo", - "model": "Item", - "foreignKey": "itemFk", - "required": true - }, - "ticket": { - "type": "belongsTo", - "model": "Ticket", - "foreignKey": "ticketFk", - "required": true - }, - "isChecked": { - "type": "hasOne", - "model": "SaleChecked", - "foreignKey": "saleFk" - }, - "components": { - "type": "hasMany", - "model": "SaleComponent", - "foreignKey": "saleFk" - } - } } diff --git a/services/ticket/common/models/saleComponent.json b/services/ticket/common/models/saleComponent.json index d10564ea8c..e2649e09bf 100644 --- a/services/ticket/common/models/saleComponent.json +++ b/services/ticket/common/models/saleComponent.json @@ -2,28 +2,28 @@ "name": "SaleComponent", "base": "VnModel", "options": { - "mysql": { - "table": "saleComponent" - } + "mysql": { + "table": "saleComponent" + } }, "properties": { - "value": { - "type": "Number" - }, - "saleFk": { - "id": true - } - }, - "relations": { - "sale": { - "type": "belongsTo", - "model": "Sale", - "foreignKey": "saleFk" + "value": { + "type": "Number" + }, + "saleFk": { + "id": true + } }, - "componentRate": { - "type": "belongsTo", - "model": "ComponentRate", - "foreignKey": "componentFk" + "relations": { + "sale": { + "type": "belongsTo", + "model": "Sale", + "foreignKey": "saleFk" + }, + "componentRate": { + "type": "belongsTo", + "model": "ComponentRate", + "foreignKey": "componentFk" + } } - } } \ No newline at end of file