{{::address.phone}},
diff --git a/modules/client/front/address/index/index.js b/modules/client/front/address/index/index.js
index 4bad9d4c8..f47d079b2 100644
--- a/modules/client/front/address/index/index.js
+++ b/modules/client/front/address/index/index.js
@@ -37,7 +37,7 @@ class Controller extends Section {
include: {
relation: 'country',
scope: {
- fields: ['id', 'country']
+ fields: ['id', 'name']
}
}
}
diff --git a/modules/client/front/create/index.html b/modules/client/front/create/index.html
index b5c23ecff..abd974cbf 100644
--- a/modules/client/front/create/index.html
+++ b/modules/client/front/create/index.html
@@ -66,7 +66,7 @@
rule>
{{code}} - {{town.name}} ({{town.province.name}},
- {{town.province.country.country}})
+ {{town.province.country.name}})
{{name}}, {{province.name}}
- ({{province.country.country}})
+ ({{province.country.name}})
@@ -101,14 +101,14 @@
url="Provinces/location"
fields="['id', 'name', 'countryFk']"
rule>
- {{name}} ({{country.country}})
+ {{name}} ({{country.name}})
+ show-field="name">
diff --git a/modules/client/front/extended-list/index.js b/modules/client/front/extended-list/index.js
index 8eed48d01..208d77539 100644
--- a/modules/client/front/extended-list/index.js
+++ b/modules/client/front/extended-list/index.js
@@ -28,7 +28,7 @@ class Controller extends Section {
field: 'countryFk',
autocomplete: {
url: 'Countries',
- showField: 'country',
+ showField: 'name',
}
},
{
diff --git a/modules/client/front/fiscal-data/index.html b/modules/client/front/fiscal-data/index.html
index c2bf86f70..979f45fcc 100644
--- a/modules/client/front/fiscal-data/index.html
+++ b/modules/client/front/fiscal-data/index.html
@@ -16,7 +16,7 @@
auto-load="true"
url="Countries"
data="countries"
- order="country">
+ order="name">
{{code}} - {{town.name}} ({{town.province.name}},
- {{town.province.country.country}})
+ {{town.province.country.name}})
{{name}}, {{province.name}}
- ({{province.country.country}})
+ ({{province.country.name}})
@@ -126,14 +126,14 @@
show-field="name"
value-field="id"
rule>
- {{name}} ({{country.country}})
+ {{name}} ({{country.name}})
@@ -184,11 +184,6 @@
-
-
+ value="{{$ctrl.summary.country.name}}">
diff --git a/modules/entry/back/methods/entry/addFromBuy.js b/modules/entry/back/methods/entry/addFromBuy.js
index 307c04b97..e5cc427a8 100644
--- a/modules/entry/back/methods/entry/addFromBuy.js
+++ b/modules/entry/back/methods/entry/addFromBuy.js
@@ -76,7 +76,6 @@ module.exports = Self => {
packing: buyUltimate.packing,
grouping: buyUltimate.grouping,
groupingMode: buyUltimate.groupingMode,
- containerFk: buyUltimate.containerFk,
comissionValue: buyUltimate.comissionValue,
packageValue: buyUltimate.packageValue,
location: buyUltimate.location,
diff --git a/modules/entry/back/methods/entry/buyLabel.js b/modules/entry/back/methods/entry/buyLabel.js
new file mode 100644
index 000000000..d9b0ebf1d
--- /dev/null
+++ b/modules/entry/back/methods/entry/buyLabel.js
@@ -0,0 +1,37 @@
+module.exports = Self => {
+ Self.remoteMethodCtx('buyLabel', {
+ description: 'Returns the entry buys labels',
+ accessType: 'READ',
+ accepts: [
+ {
+ arg: 'id',
+ type: 'number',
+ required: true,
+ description: 'The entry id',
+ http: {source: 'path'}
+ }
+ ],
+ returns: [
+ {
+ arg: 'body',
+ type: 'file',
+ root: true
+ }, {
+ arg: 'Content-Type',
+ type: 'String',
+ http: {target: 'header'}
+ }, {
+ arg: 'Content-Disposition',
+ type: 'String',
+ http: {target: 'header'}
+ }
+ ],
+ http: {
+ path: '/:id/buy-label',
+ verb: 'GET'
+ },
+ accessScopes: ['DEFAULT', 'read:multimedia']
+ });
+
+ Self.buyLabel = (ctx, id) => Self.printReport(ctx, id, 'buy-label');
+};
diff --git a/modules/entry/back/methods/entry/filter.js b/modules/entry/back/methods/entry/filter.js
index 1cd12b737..f21d9dbc4 100644
--- a/modules/entry/back/methods/entry/filter.js
+++ b/modules/entry/back/methods/entry/filter.js
@@ -112,7 +112,6 @@ module.exports = Self => {
if (typeof options == 'object')
Object.assign(myOptions, options);
-
const conn = Self.dataSource.connector;
const where = buildFilter(ctx.args, (param, value) => {
switch (param) {
@@ -146,7 +145,13 @@ module.exports = Self => {
}
});
filter = mergeFilters(ctx.args.filter, {where});
-
+ const userId = ctx.req.accessToken.userId;
+ const client = await Self.app.models.Client.findById(userId, myOptions);
+ const supplier = await Self.app.models.Supplier.findOne({where: {nif: client.fi}}, myOptions);
+ if (supplier) {
+ if (!filter.where) filter.where = {};
+ filter.where[`e.supplierFk`] = supplier.id;
+ }
const stmts = [];
let stmt;
stmt = new ParameterizedSQL(
@@ -158,7 +163,7 @@ module.exports = Self => {
e.invoiceNumber,
e.isBooked,
e.isExcludedFromAvailable,
- e.evaNotes AS observation,
+ e.evaNotes observation,
e.isConfirmed,
e.isOrdered,
e.isRaid,
@@ -170,13 +175,19 @@ module.exports = Self => {
e.gestDocFk,
e.invoiceInFk,
t.landed,
- s.name AS supplierName,
- s.nickname AS supplierAlias,
- co.code AS companyCode,
- cu.code AS currencyCode
+ s.name supplierName,
+ s.nickname supplierAlias,
+ co.code companyCode,
+ cu.code currencyCode,
+ t.shipped,
+ t.landed,
+ t.ref AS travelRef,
+ t.warehouseInFk,
+ w.name warehouseInName
FROM vn.entry e
JOIN vn.supplier s ON s.id = e.supplierFk
JOIN vn.travel t ON t.id = e.travelFk
+ JOIN vn.warehouse w ON w.id = t.warehouseInFk
JOIN vn.company co ON co.id = e.companyFk
JOIN vn.currency cu ON cu.id = e.currencyFk`
);
diff --git a/modules/entry/back/methods/entry/getBuys.js b/modules/entry/back/methods/entry/getBuys.js
index 90c1bb9d0..0cb71653e 100644
--- a/modules/entry/back/methods/entry/getBuys.js
+++ b/modules/entry/back/methods/entry/getBuys.js
@@ -1,7 +1,9 @@
+const UserError = require('vn-loopback/util/user-error');
+
const mergeFilters = require('vn-loopback/util/filter').mergeFilters;
module.exports = Self => {
- Self.remoteMethod('getBuys', {
+ Self.remoteMethodCtx('getBuys', {
description: 'Returns buys for one entry',
accessType: 'READ',
accepts: [{
@@ -27,13 +29,20 @@ module.exports = Self => {
}
});
- Self.getBuys = async(id, filter, options) => {
+ Self.getBuys = async(ctx, id, filter, options) => {
+ const userId = ctx.req.accessToken.userId;
const models = Self.app.models;
const myOptions = {};
if (typeof options == 'object')
Object.assign(myOptions, options);
+ const client = await Self.app.models.Client.findById(userId, myOptions);
+ const supplier = await Self.app.models.Supplier.findOne({where: {nif: client.fi}}, myOptions);
+ if (supplier) {
+ const isEntryOwner = (await Self.findById(id)).supplierFk === supplier.id;
+ if (!isEntryOwner) throw new UserError('Access Denied');
+ }
let defaultFilter = {
where: {entryFk: id},
fields: [
@@ -48,9 +57,24 @@ module.exports = Self => {
'weight',
'buyingValue',
'price2',
- 'price3'
+ 'price3',
+ 'printedStickers',
+ 'entryFk'
],
- include: {
+ include: [{
+ relation: 'entry',
+ scope: {
+ fields: [
+ 'id', 'supplierFk'
+ ],
+ include: {
+ relation: 'supplier', scope: {
+ fields: ['id']
+ }
+ }
+ }
+ },
+ {
relation: 'item',
scope: {
fields: [
@@ -81,9 +105,8 @@ module.exports = Self => {
}
}
}
- }
+ }]
};
-
defaultFilter = mergeFilters(defaultFilter, filter);
return models.Buy.find(defaultFilter, myOptions);
diff --git a/modules/entry/back/methods/entry/specs/addFromPackaging.spec.js b/modules/entry/back/methods/entry/specs/addFromPackaging.spec.js
index 1b0d4656f..0c8d2729b 100644
--- a/modules/entry/back/methods/entry/specs/addFromPackaging.spec.js
+++ b/modules/entry/back/methods/entry/specs/addFromPackaging.spec.js
@@ -1,5 +1,4 @@
const models = require('vn-loopback/server/server').models;
-const LoopBackContext = require('loopback-context');
describe('entry addFromPackaging()', () => {
const supplier = 442;
@@ -7,22 +6,10 @@ describe('entry addFromPackaging()', () => {
const yesterday = new Date(today);
yesterday.setDate(today.getDate() - 1);
- beforeAll(async() => {
- const activeCtx = {
- accessToken: {userId: 49},
- http: {
- req: {
- headers: {origin: 'http://localhost'},
- },
- },
- };
- spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
- active: activeCtx,
- });
- });
+ beforeAll.mockLoopBackContext();
it('should create an incoming travel', async() => {
- const ctx = {args: {isTravelReception: true, supplier}};
+ const ctx = {accessToken: {userId: 49}, args: {isTravelReception: true, supplier}};
const tx = await models.Entry.beginTransaction({});
const options = {transaction: tx};
diff --git a/modules/entry/back/methods/entry/specs/editLatestBuys.spec.js b/modules/entry/back/methods/entry/specs/editLatestBuys.spec.js
index 885171ed5..f319c112a 100644
--- a/modules/entry/back/methods/entry/specs/editLatestBuys.spec.js
+++ b/modules/entry/back/methods/entry/specs/editLatestBuys.spec.js
@@ -1,21 +1,7 @@
const models = require('vn-loopback/server/server').models;
-const LoopBackContext = require('loopback-context');
describe('Buy editLatestsBuys()', () => {
- beforeAll(async() => {
- const activeCtx = {
- accessToken: {userId: 9},
- http: {
- req: {
- headers: {origin: 'http://localhost'}
- }
- }
- };
-
- spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
- active: activeCtx
- });
- });
+ beforeAll.mockLoopBackContext();
it('should change the value of a given column for the selected buys', async() => {
const tx = await models.Buy.beginTransaction({});
diff --git a/modules/entry/back/methods/entry/specs/filter.spec.js b/modules/entry/back/methods/entry/specs/filter.spec.js
index 28763bc81..c8a5bd94f 100644
--- a/modules/entry/back/methods/entry/specs/filter.spec.js
+++ b/modules/entry/back/methods/entry/specs/filter.spec.js
@@ -9,7 +9,8 @@ describe('Entry filter()', () => {
const ctx = {
args: {
search: 1
- }
+ },
+ req: {accessToken: {userId: 9}}
};
const result = await models.Entry.filter(ctx, options);
@@ -32,7 +33,8 @@ describe('Entry filter()', () => {
const ctx = {
args: {
currencyFk: 1
- }
+ },
+ req: {accessToken: {userId: 9}}
};
const result = await models.Entry.filter(ctx, options);
@@ -46,26 +48,73 @@ describe('Entry filter()', () => {
}
});
- it('should return the entry matching the supplier', async() => {
- const tx = await models.Entry.beginTransaction({});
- const options = {transaction: tx};
+ describe('should return the entry matching the supplier', () => {
+ it('when userId is supplier ', async() => {
+ const tx = await models.Entry.beginTransaction({});
+ const options = {transaction: tx};
- try {
- const ctx = {
- args: {
- supplierFk: 2
- }
- };
+ try {
+ const ctx = {
+ args: {},
+ req: {accessToken: {userId: 1102}}
+ };
- const result = await models.Entry.filter(ctx, options);
+ const result = await models.Entry.filter(ctx, options);
- expect(result.length).toEqual(6);
+ expect(result.length).toEqual(6);
- await tx.rollback();
- } catch (e) {
- await tx.rollback();
- throw e;
- }
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+
+ it('when userId is supplier fetching other supplier', async() => {
+ const tx = await models.Entry.beginTransaction({});
+ const options = {transaction: tx};
+
+ try {
+ const ctx = {
+ args: {
+ supplierFk: 1
+ },
+ req: {accessToken: {userId: 1102}}
+ };
+
+ const result = await models.Entry.filter(ctx, options);
+
+ expect(result.length).toEqual(6);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+
+ it('when userId is not supplier', async() => {
+ const tx = await models.Entry.beginTransaction({});
+ const options = {transaction: tx};
+
+ try {
+ const ctx = {
+ args: {
+ supplierFk: 2
+ },
+ req: {accessToken: {userId: 9}}
+ };
+
+ const result = await models.Entry.filter(ctx, options);
+
+ expect(result.length).toEqual(6);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
});
it('should return the entry matching the company', async() => {
@@ -76,7 +125,8 @@ describe('Entry filter()', () => {
const ctx = {
args: {
companyFk: 442
- }
+ },
+ req: {accessToken: {userId: 9}}
};
const result = await models.Entry.filter(ctx, options);
@@ -98,7 +148,8 @@ describe('Entry filter()', () => {
const ctx = {
args: {
isBooked: true,
- }
+ },
+ req: {accessToken: {userId: 9}}
};
const result = await models.Entry.filter(ctx, options);
@@ -121,7 +172,8 @@ describe('Entry filter()', () => {
args: {
reference: 'movement',
travelFk: '2'
- }
+ },
+ req: {accessToken: {userId: 9}}
};
const result = await models.Entry.filter(ctx, options);
diff --git a/modules/entry/back/methods/entry/specs/getBuys.spec.js b/modules/entry/back/methods/entry/specs/getBuys.spec.js
index cf4462e48..2d3531249 100644
--- a/modules/entry/back/methods/entry/specs/getBuys.spec.js
+++ b/modules/entry/back/methods/entry/specs/getBuys.spec.js
@@ -1,24 +1,82 @@
+const UserError = require('vn-loopback/util/user-error');
const models = require('vn-loopback/server/server').models;
describe('entry getBuys()', () => {
const entryId = 4;
- it('should get the buys and items of an entry', async() => {
- const tx = await models.Entry.beginTransaction({});
- const options = {transaction: tx};
+ describe('should get the buys and items of an entry ', () => {
+ it('when is supplier and entry owner', async() => {
+ const tx = await models.Entry.beginTransaction({});
+ const options = {transaction: tx};
- try {
- const result = await models.Entry.getBuys(entryId, options);
+ try {
+ const ctx = {
+ args: {
+ search: 1
+ },
+ req: {accessToken: {userId: 2}}
+ };
- const length = result.length;
- const anyResult = result[Math.floor(Math.random() * Math.floor(length))];
+ const result = await models.Entry.getBuys(ctx, entryId, options);
- expect(result.length).toEqual(4);
- expect(anyResult.item).toBeDefined();
+ const length = result.length;
+ const anyResult = result[Math.floor(Math.random() * Math.floor(length))];
- await tx.rollback();
- } catch (e) {
- await tx.rollback();
- throw e;
- }
+ expect(result.length).toEqual(4);
+ expect(anyResult.item).toBeDefined();
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+
+ it('when is supplier but not entry owner', async() => {
+ const tx = await models.Entry.beginTransaction({});
+ const options = {transaction: tx};
+ const entryId = 1;
+ try {
+ const ctx = {
+ args: {
+ search: 1
+ },
+ req: {accessToken: {userId: 1102}}
+ };
+
+ const result = await models.Entry.getBuys(ctx, entryId, options);
+
+ expect(result).toBeUndefined();
+ } catch (error) {
+ expect(error).toBeInstanceOf(UserError);
+ expect(error.message).toBe('Access Denied');
+ }
+ });
+
+ it('when is not supplier', async() => {
+ const tx = await models.Entry.beginTransaction({});
+ const options = {transaction: tx};
+
+ try {
+ const ctx = {
+ args: {
+ search: 1
+ },
+ req: {accessToken: {userId: 9}}
+ };
+
+ const result = await models.Entry.getBuys(ctx, entryId, options);
+
+ const length = result.length;
+ const anyResult = result[Math.floor(Math.random() * Math.floor(length))];
+
+ expect(result.length).toEqual(4);
+ expect(anyResult.item).toBeDefined();
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
});
});
diff --git a/modules/entry/back/methods/entry/specs/importBuysPreview.spec.js b/modules/entry/back/methods/entry/specs/importBuysPreview.spec.js
index c860e228e..fb3268901 100644
--- a/modules/entry/back/methods/entry/specs/importBuysPreview.spec.js
+++ b/modules/entry/back/methods/entry/specs/importBuysPreview.spec.js
@@ -1,14 +1,8 @@
const models = require('vn-loopback/server/server').models;
-const LoopBackContext = require('loopback-context');
-const activeCtx = {accessToken: {userId: 9}};
describe('entry importBuysPreview()', () => {
const entryId = 1;
- beforeAll(async() => {
- spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
- active: activeCtx
- });
- });
+ beforeAll.mockLoopBackContext();
it('should return the buys with the calculated packagingFk', async() => {
const tx = await models.Entry.beginTransaction({});
diff --git a/modules/entry/back/model-config.json b/modules/entry/back/model-config.json
index 7b6e23685..dc7fd86be 100644
--- a/modules/entry/back/model-config.json
+++ b/modules/entry/back/model-config.json
@@ -22,5 +22,8 @@
},
"EntryObservation": {
"dataSource": "vn"
+ },
+ "EntryType": {
+ "dataSource": "vn"
}
-}
+}
\ No newline at end of file
diff --git a/modules/entry/back/models/buy.json b/modules/entry/back/models/buy.json
index 35861fd81..14cafde06 100644
--- a/modules/entry/back/models/buy.json
+++ b/modules/entry/back/models/buy.json
@@ -63,9 +63,6 @@
"isIgnored": {
"type": "boolean"
},
- "containerFk": {
- "type": "number"
- },
"location": {
"type": "number"
},
diff --git a/modules/entry/back/models/entry-type.json b/modules/entry/back/models/entry-type.json
new file mode 100644
index 000000000..989aa3a8a
--- /dev/null
+++ b/modules/entry/back/models/entry-type.json
@@ -0,0 +1,25 @@
+{
+ "name": "EntryType",
+ "base": "VnModel",
+ "mixins": {
+ "Loggable": true
+ },
+ "options": {
+ "mysql": {
+ "table": "entryType"
+ }
+ },
+ "properties": {
+ "code": {
+ "type": "string",
+ "id": true,
+ "description": "Identifier"
+ },
+ "description": {
+ "type": "string"
+ },
+ "isInformal": {
+ "type": "boolean"
+ }
+ }
+}
\ No newline at end of file
diff --git a/modules/entry/back/models/entry.js b/modules/entry/back/models/entry.js
index 6148ae559..6e27e1ece 100644
--- a/modules/entry/back/models/entry.js
+++ b/modules/entry/back/models/entry.js
@@ -9,6 +9,7 @@ module.exports = Self => {
require('../methods/entry/entryOrderPdf')(Self);
require('../methods/entry/addFromPackaging')(Self);
require('../methods/entry/addFromBuy')(Self);
+ require('../methods/entry/buyLabel')(Self);
Self.observe('before save', async function(ctx, options) {
if (ctx.isNewInstance) return;
diff --git a/modules/entry/back/models/entry.json b/modules/entry/back/models/entry.json
index ab451219e..833edf14d 100644
--- a/modules/entry/back/models/entry.json
+++ b/modules/entry/back/models/entry.json
@@ -35,9 +35,9 @@
},
"isVirtual": {
"type": "boolean",
- "mysql": {
- "columnName": "isRaid"
- }
+ "mysql": {
+ "columnName": "isRaid"
+ }
},
"isRaid": {
"type": "boolean"
@@ -53,9 +53,9 @@
},
"observation": {
"type": "string",
- "mysql": {
- "columnName": "evaNotes"
- }
+ "mysql": {
+ "columnName": "evaNotes"
+ }
},
"loadPriority": {
"type": "number"
@@ -101,6 +101,11 @@
"type": "belongsTo",
"model": "Account",
"foreignKey": "observationEditorFk"
+ },
+ "entryType": {
+ "type": "belongsTo",
+ "model": "EntryType",
+ "foreignKey": "typeFk"
}
}
-}
+}
\ No newline at end of file
diff --git a/modules/entry/front/basic-data/index.html b/modules/entry/front/basic-data/index.html
deleted file mode 100644
index 57de1c5f7..000000000
--- a/modules/entry/front/basic-data/index.html
+++ /dev/null
@@ -1,234 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ID
- Agency
- Warehouse Out
- Warehouse In
- Shipped
- Landed
-
-
-
-
-
-
- {{::travel.id}}
-
-
- {{::travel.agency.name}}
- {{::travel.warehouseOut.name}}
- {{::travel.warehouseIn.name}}
- {{::travel.shipped | date: 'dd/MM/yyyy'}}
- {{::travel.landed | date: 'dd/MM/yyyy'}}
-
-
-
-
-
-
-
-
diff --git a/modules/entry/front/basic-data/index.js b/modules/entry/front/basic-data/index.js
deleted file mode 100644
index 564a3df5c..000000000
--- a/modules/entry/front/basic-data/index.js
+++ /dev/null
@@ -1,68 +0,0 @@
-import ngModule from '../module';
-import Section from 'salix/components/section';
-import './style.scss';
-
-class Controller extends Section {
- showFilterDialog(travel) {
- this.activeTravel = travel;
- this.travelFilterParams = {};
- this.travelFilter = {
- include: [
- {
- relation: 'agency',
- scope: {
- fields: ['name']
- }
- },
- {
- relation: 'warehouseIn',
- scope: {
- fields: ['name']
- }
- },
- {
- relation: 'warehouseOut',
- scope: {
- fields: ['name']
- }
- }
- ]
- };
-
- this.$.filterDialog.show();
- }
-
- selectTravel(id) {
- this.entry.travelFk = id;
- this.$.filterDialog.hide();
- }
-
- filter() {
- const filter = this.travelFilter;
- const params = this.travelFilterParams;
- const where = {};
- for (let key in params) {
- const value = params[key];
- if (!value) continue;
-
- switch (key) {
- case 'agencyModeFk':
- case 'warehouseInFk':
- case 'warehouseOutFk':
- case 'shipped':
- case 'landed':
- where[key] = value;
- }
- }
-
- filter.where = where;
- this.$.travelsModel.applyFilter(filter);
- }
-}
-ngModule.vnComponent('vnEntryBasicData', {
- template: require('./index.html'),
- bindings: {
- entry: '<'
- },
- controller: Controller
-});
diff --git a/modules/entry/front/basic-data/style.scss b/modules/entry/front/basic-data/style.scss
deleted file mode 100644
index 508aa9091..000000000
--- a/modules/entry/front/basic-data/style.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.travelFilter{
- width: 950px;
-}
diff --git a/modules/entry/front/buy/import/index.html b/modules/entry/front/buy/import/index.html
deleted file mode 100644
index 28396434c..000000000
--- a/modules/entry/front/buy/import/index.html
+++ /dev/null
@@ -1,205 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ID
- Item
- Size
- Producer
- Color
-
-
-
-
-
-
- {{::item.id}}
-
-
- {{::item.name}}
- {{::item.size}}
- {{::item.producerName}}
- {{::item.inkName}}
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/entry/front/buy/import/index.js b/modules/entry/front/buy/import/index.js
deleted file mode 100644
index ba0a98e62..000000000
--- a/modules/entry/front/buy/import/index.js
+++ /dev/null
@@ -1,159 +0,0 @@
-import ngModule from '../../module';
-import Section from 'salix/components/section';
-import './style.scss';
-
-class Controller extends Section {
- constructor($element, $) {
- super($element, $);
- this.import = {
- file: '',
- invoice: null,
- buys: []
- };
- }
-
- onFileChange($event) {
- const input = $event.target;
- const file = input.files[0];
-
- const reader = new FileReader();
- reader.onload = event =>
- this.fillData(event.target.result);
- reader.readAsText(file, 'UTF-8');
- }
-
- fillData(raw) {
- const data = JSON.parse(raw);
- const [invoice] = data.invoices;
-
- this.$.$applyAsync(() => {
- this.import.observation = invoice.tx_awb;
-
- const companyName = invoice.tx_company;
- const boxes = invoice.boxes;
- const buys = [];
- for (let box of boxes) {
- const boxVolume = box.nu_length * box.nu_width * box.nu_height;
- for (let product of box.products) {
- const packing = product.nu_stems_bunch * product.nu_bunches;
- buys.push({
- description: product.nm_product,
- companyName: companyName,
- size: product.nu_length,
- packing: packing,
- grouping: product.nu_stems_bunch,
- buyingValue: parseFloat(product.mny_rate_stem),
- volume: boxVolume,
- });
- }
- }
-
- const boxesId = boxes.map(box => box.id_box);
- this.import.ref = boxesId.join(', ');
-
- this.fetchBuys(buys);
- });
- }
-
- fetchBuys(buys) {
- const params = {buys};
- const query = `Entries/${this.$params.id}/importBuysPreview`;
- this.$http.post(query, params).then(res => {
- this.import.buys = res.data;
- });
- }
-
- onSubmit() {
- try {
- const params = this.import;
- const hasAnyEmptyRow = params.buys.some(buy => {
- return buy.itemFk == null;
- });
-
- if (hasAnyEmptyRow)
- throw new Error(`Some of the imported buys doesn't have an item`);
-
- const query = `Entries/${this.$params.id}/importBuys`;
- return this.$http.post(query, params)
- .then(() => this.vnApp.showSuccess(this.$t('Data saved!')))
- .then(() => this.$state.go('entry.card.buy.index'));
- } catch (e) {
- this.vnApp.showError(this.$t(e.message));
- return false;
- }
- }
-
- itemSearchFunc($search) {
- return /^\d+$/.test($search)
- ? {id: $search}
- : {name: {like: '%' + $search + '%'}};
- }
-
- showFilterDialog(buy) {
- this.activeBuy = buy;
- this.itemFilterParams = {};
- this.itemFilter = {
- include: [
- {
- relation: 'producer',
- scope: {
- fields: ['name']
- }
- },
- {
- relation: 'ink',
- scope: {
- fields: ['name']
- }
- }
- ]
- };
-
- this.$.filterDialog.show();
- }
-
- selectItem(id) {
- this.activeBuy['itemFk'] = id;
- this.$.filterDialog.hide();
- }
-
- filter() {
- const filter = this.itemFilter;
- const params = this.itemFilterParams;
- const where = {};
-
- for (let key in params) {
- const value = params[key];
- if (!value) continue;
-
- switch (key) {
- case 'name':
- where[key] = {like: `%${value}%`};
- break;
- case 'producerFk':
- case 'typeFk':
- case 'size':
- case 'inkFk':
- where[key] = value;
- }
- }
-
- filter.where = where;
- this.$.itemsModel.applyFilter(filter);
- }
-
- onKeyPress($event) {
- if ($event.key === 'Enter')
- this.filter();
- }
-}
-
-Controller.$inject = ['$element', '$scope'];
-
-ngModule.vnComponent('vnEntryBuyImport', {
- template: require('./index.html'),
- controller: Controller,
- bindings: {
- worker: '<'
- }
-});
diff --git a/modules/entry/front/buy/import/index.spec.js b/modules/entry/front/buy/import/index.spec.js
deleted file mode 100644
index 036f52074..000000000
--- a/modules/entry/front/buy/import/index.spec.js
+++ /dev/null
@@ -1,199 +0,0 @@
-import './index.js';
-
-describe('Entry', () => {
- describe('Component vnEntryBuyImport', () => {
- let controller;
- let $httpParamSerializer;
- let $httpBackend;
-
- beforeEach(ngModule('entry'));
-
- beforeEach(angular.mock.inject(($componentController, $compile, $rootScope, _$httpParamSerializer_, _$httpBackend_) => {
- $httpBackend = _$httpBackend_;
- $httpParamSerializer = _$httpParamSerializer_;
- let $element = $compile(' {
- it(`should call to the fillData() method`, () => {
- controller.fetchBuys = jest.fn();
-
- const rawData = `{
- "invoices": [
- {
- "tx_awb": "123456",
- "boxes": [
- {
- "id_box": 1,
- "nu_length": 1,
- "nu_width": 15,
- "nu_height": 80,
- "products": [
- {
- "nm_product": "Bow",
- "nu_length": 1,
- "nu_stems_bunch": 1,
- "nu_bunches": 1,
- "mny_rate_stem": 5.77
- }
-
- ]
- },
- {
- "id_box": 2,
- "nu_length": 25,
- "nu_width": 1,
- "nu_height": 45,
- "products": [
- {
- "nm_product": "Arrow",
- "nu_length": 25,
- "nu_stems_bunch": 1,
- "nu_bunches": 1,
- "mny_rate_stem": 2.16
- }
- ]
- }
- ]
- }
- ]}`;
- const expectedBuys = [
- {
- 'buyingValue': 5.77,
- 'description': 'Bow',
- 'grouping': 1,
- 'packing': 1,
- 'size': 1,
- 'volume': 1200},
-
- {
- 'buyingValue': 2.16,
- 'description': 'Arrow',
- 'grouping': 1,
- 'packing': 1,
- 'size': 25,
- 'volume': 1125}
- ];
- controller.fillData(rawData);
- controller.$.$apply();
-
- const importData = controller.import;
-
- expect(importData.observation).toEqual('123456');
- expect(importData.ref).toEqual('1, 2');
-
- expect(controller.fetchBuys).toHaveBeenCalledWith(expectedBuys);
- });
- });
-
- describe('fetchBuys()', () => {
- it(`should perform a query to fetch the buys data`, () => {
- const buys = [
- {
- 'buyingValue': 5.77,
- 'description': 'Bow',
- 'grouping': 1,
- 'packing': 1,
- 'size': 1,
- 'volume': 1200},
-
- {
- 'buyingValue': 2.16,
- 'description': 'Arrow',
- 'grouping': 1,
- 'packing': 1,
- 'size': 25,
- 'volume': 1125}
- ];
-
- const query = `Entries/1/importBuysPreview`;
- $httpBackend.expectPOST(query).respond(200, buys);
- controller.fetchBuys(buys);
- $httpBackend.flush();
-
- const importData = controller.import;
-
- expect(importData.buys.length).toEqual(2);
- });
- });
-
- describe('onSubmit()', () => {
- it(`should throw an error when some of the rows doesn't have an item`, () => {
- jest.spyOn(controller.vnApp, 'showError');
-
- controller.import = {
- observation: '123456',
- ref: '1, 2',
- buys: [
- {
- 'buyingValue': 5.77,
- 'description': 'Bow',
- 'grouping': 1,
- 'packing': 1,
- 'size': 1,
- 'volume': 1200},
- {
- 'buyingValue': 2.16,
- 'description': 'Arrow',
- 'grouping': 1,
- 'packing': 1,
- 'size': 25,
- 'volume': 1125}
- ]
- };
-
- controller.onSubmit();
-
- const message = `Some of the imported buys doesn't have an item`;
-
- expect(controller.vnApp.showError).toHaveBeenCalledWith(message);
- });
-
- it(`should now perform a query to update columns`, () => {
- jest.spyOn(controller.vnApp, 'showSuccess');
- controller.$state.go = jest.fn();
-
- controller.import = {
- observation: '123456',
- ref: '1, 2',
- buys: [
- {
- 'itemFk': 10,
- 'buyingValue': 5.77,
- 'description': 'Bow',
- 'grouping': 1,
- 'packing': 1,
- 'size': 1,
- 'volume': 1200},
- {
- 'itemFk': 11,
- 'buyingValue': 2.16,
- 'description': 'Arrow',
- 'grouping': 1,
- 'packing': 1,
- 'size': 25,
- 'volume': 1125}
- ]
- };
- const params = controller.import;
-
- const query = `Entries/1/importBuys`;
- $httpBackend.expectPOST(query, params).respond(200, params.buys);
- controller.onSubmit();
- $httpBackend.flush();
-
- const importData = controller.import;
-
- expect(importData.buys.length).toEqual(2);
-
- expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Data saved!');
- expect(controller.$state.go).toHaveBeenCalledWith('entry.card.buy.index');
- });
- });
- });
-});
diff --git a/modules/entry/front/buy/import/style.scss b/modules/entry/front/buy/import/style.scss
deleted file mode 100644
index 9b2fb7688..000000000
--- a/modules/entry/front/buy/import/style.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-.itemFilter {
- vn-table.scrollable {
- height: 500px
- }
-}
\ No newline at end of file
diff --git a/modules/entry/front/buy/index/index.html b/modules/entry/front/buy/index/index.html
deleted file mode 100644
index 0e0c69788..000000000
--- a/modules/entry/front/buy/index/index.html
+++ /dev/null
@@ -1,243 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/modules/entry/front/buy/index/index.js b/modules/entry/front/buy/index/index.js
deleted file mode 100644
index 9131c31f6..000000000
--- a/modules/entry/front/buy/index/index.js
+++ /dev/null
@@ -1,81 +0,0 @@
-import ngModule from '../../module';
-import './style.scss';
-import Section from 'salix/components/section';
-
-export default class Controller extends Section {
- saveBuy(buy) {
- const missingData = !buy.itemFk || !buy.quantity || !buy.packagingFk;
- if (missingData) return;
-
- let options;
- if (buy.id) {
- options = {
- query: `Buys/${buy.id}`,
- method: 'patch'
- };
- }
- this.$http[options.method](options.query, buy).then(res => {
- if (!res.data) return;
-
- buy = Object.assign(buy, res.data);
- this.vnApp.showSuccess(this.$t('Data saved!'));
- });
- }
-
- /**
- * Returns checked instances
- *
- * @return {Array} Checked instances
- */
- selectedBuys() {
- if (!this.buys) return;
-
- return this.buys.filter(buy => {
- return buy.checked;
- });
- }
-
- deleteBuys() {
- const buys = this.selectedBuys();
- const actualInstances = buys.filter(buy => buy.id);
-
- const params = {buys: actualInstances};
-
- if (actualInstances.length) {
- this.$http.post(`Buys/deleteBuys`, params).then(() => {
- this.vnApp.showSuccess(this.$t('Data saved!'));
- });
- }
- buys.forEach(buy => {
- const index = this.buys.indexOf(buy);
- this.buys.splice(index, 1);
- });
- }
-
- toggleGroupingMode(buy, mode) {
- const groupingMode = mode === 'grouping' ? mode : 'packing';
- const newGroupingMode = buy.groupingMode === groupingMode ? null : groupingMode;
- const params = {
- groupingMode: newGroupingMode
- };
-
- this.$http.patch(`Buys/${buy.id}`, params).then(() => {
- buy.groupingMode = newGroupingMode;
- this.vnApp.showSuccess(this.$t('Data saved!'));
- });
- }
-
- itemSearchFunc($search) {
- return /^\d+$/.test($search)
- ? {id: $search}
- : {name: {like: '%' + $search + '%'}};
- }
-}
-
-ngModule.vnComponent('vnEntryBuyIndex', {
- template: require('./index.html'),
- controller: Controller,
- bindings: {
- entry: '<'
- }
-});
diff --git a/modules/entry/front/buy/index/index.spec.js b/modules/entry/front/buy/index/index.spec.js
deleted file mode 100644
index f5c6d1bdb..000000000
--- a/modules/entry/front/buy/index/index.spec.js
+++ /dev/null
@@ -1,92 +0,0 @@
-/* eslint max-len: ["error", { "code": 150 }]*/
-import './index.js';
-
-describe('Entry buy', () => {
- let controller;
- let $httpBackend;
-
- beforeEach(ngModule('entry'));
-
- beforeEach(angular.mock.inject(($componentController, $compile, $rootScope, _$httpParamSerializer_, _$httpBackend_) => {
- $httpBackend = _$httpBackend_;
- let $element = $compile(' {
- it(`should call the buys patch route if the received buy has an ID`, () => {
- const buy = {id: 1, itemFk: 1, quantity: 1, packagingFk: 1};
-
- const query = `Buys/${buy.id}`;
-
- $httpBackend.expectPATCH(query).respond(200);
- controller.saveBuy(buy);
- $httpBackend.flush();
- });
- });
-
- describe('deleteBuys()', () => {
- it(`should perform no queries if all buys to delete were not actual instances`, () => {
- controller.buys = [
- {checked: true},
- {checked: true},
- {checked: false}];
-
- controller.deleteBuys();
-
- expect(controller.buys.length).toEqual(1);
- });
-
- it(`should perform a query to delete as there's an actual instance at least`, () => {
- controller.buys = [
- {checked: true, id: 1},
- {checked: true},
- {checked: false}];
-
- const query = 'Buys/deleteBuys';
-
- $httpBackend.expectPOST(query).respond(200);
- controller.deleteBuys();
- $httpBackend.flush();
-
- expect(controller.buys.length).toEqual(1);
- });
- });
-
- describe('toggleGroupingMode()', () => {
- it(`should toggle grouping mode from grouping to packing`, () => {
- const buy = {id: 999, groupingMode: 'grouping'};
-
- const query = `Buys/${buy.id}`;
- $httpBackend.expectPATCH(query, {groupingMode: 'packing'}).respond(200);
- controller.toggleGroupingMode(buy, 'packing');
- $httpBackend.flush();
- });
-
- it(`should toggle grouping mode from packing to grouping`, () => {
- const buy = {id: 999, groupingMode: 'packing'};
- const query = `Buys/${buy.id}`;
- $httpBackend.expectPATCH(query, {groupingMode: 'grouping'}).respond(200);
- controller.toggleGroupingMode(buy, 'grouping');
- $httpBackend.flush();
- });
-
- it(`should toggle off the grouping mode if it was packing to packing`, () => {
- const buy = {id: 999, groupingMode: 'packing'};
- const query = `Buys/${buy.id}`;
- $httpBackend.expectPATCH(query, {groupingMode: null}).respond(200);
- controller.toggleGroupingMode(buy, 'packing');
- $httpBackend.flush();
- });
-
- it(`should toggle off the grouping mode if it was grouping to grouping`, () => {
- const buy = {id: 999, groupingMode: 'grouping'};
- const query = `Buys/${buy.id}`;
- $httpBackend.expectPATCH(query, {groupingMode: null}).respond(200);
- controller.toggleGroupingMode(buy, 'grouping');
- $httpBackend.flush();
- });
- });
-});
diff --git a/modules/entry/front/buy/index/locale/es.yml b/modules/entry/front/buy/index/locale/es.yml
deleted file mode 100644
index 0a1ecf5b1..000000000
--- a/modules/entry/front/buy/index/locale/es.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-Buys: Compras
-Delete buy(s): Eliminar compra(s)
-Add buy: Añadir compra
\ No newline at end of file
diff --git a/modules/entry/front/buy/index/style.scss b/modules/entry/front/buy/index/style.scss
deleted file mode 100644
index 3fad252df..000000000
--- a/modules/entry/front/buy/index/style.scss
+++ /dev/null
@@ -1,42 +0,0 @@
-@import "variables";
-
-
-vn-entry-buy-index vn-card {
- max-width: $width-xl;
-
- .dark-row {
- background-color: lighten($color-marginal, 10%);
- }
-
- thead tr {
- border: 1px solid white;;
- }
-
- tbody tr:nth-child(1),
- tbody tr:nth-child(2) {
- border-left: 1px solid $color-spacer;
- border-right: 1px solid $color-spacer;
- }
-
- tbody tr:nth-child(2) {
- border-bottom: 1px solid $color-spacer;
- }
-
- tbody{
- border-bottom: 1px solid $color-spacer;
- }
-
- tbody:last-child {
- border-bottom: 0;
- }
-
- tbody tr:nth-child(3) {
- height: inherit
- }
-
- tr {
- margin-bottom: 10px;
- }
-}
-
-$color-font-link-medium: lighten($color-font-link, 20%)
diff --git a/modules/entry/front/buy/locale/es.yml b/modules/entry/front/buy/locale/es.yml
deleted file mode 100644
index 55828a3c6..000000000
--- a/modules/entry/front/buy/locale/es.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-reference: Referencia
-Observation: Observación
-Box: Embalaje
-Import buys: Importar compras
-Some of the imported buys doesn't have an item: Algunas de las compras importadas no tienen un artículo
-JSON files only: Solo ficheros JSON
-Filter item: Filtrar artículo
-Filter...: Filtrar...
\ No newline at end of file
diff --git a/modules/entry/front/card/index.html b/modules/entry/front/card/index.html
deleted file mode 100644
index d386a9ebf..000000000
--- a/modules/entry/front/card/index.html
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/modules/entry/front/create/index.js b/modules/entry/front/create/index.js
deleted file mode 100644
index 5c61730f9..000000000
--- a/modules/entry/front/create/index.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import ngModule from '../module';
-import Section from 'salix/components/section';
-import './style.scss';
-
-export default class Controller extends Section {
- constructor($element, $) {
- super($element, $);
-
- this.entry = {
- companyFk: this.vnConfig.companyFk
- };
-
- if (this.$params && this.$params.supplierFk)
- this.entry.supplierFk = parseInt(this.$params.supplierFk);
- if (this.$params && this.$params.travelFk)
- this.entry.travelFk = parseInt(this.$params.travelFk);
- if (this.$params && this.$params.companyFk)
- this.entry.companyFk = parseInt(this.$params.companyFk);
- }
-
- onSubmit() {
- this.$.watcher.submit().then(
- res => this.$state.go('entry.card.basicData', {id: res.data.id})
- );
- }
-
- searchFunction($search) {
- return {or: [
- {'agencyModeName': {like: `%${$search}%`}},
- {'warehouseInName': {like: `%${$search}%`}},
- {'warehouseOutName': {like: `%${$search}%`}},
- {'shipped': new Date($search)},
- {'landed': new Date($search)}
- ]};
- }
-}
-
-Controller.$inject = ['$element', '$scope'];
-
-ngModule.vnComponent('vnEntryCreate', {
- template: require('./index.html'),
- controller: Controller
-});
diff --git a/modules/entry/front/create/locale/es.yml b/modules/entry/front/create/locale/es.yml
deleted file mode 100644
index aa269ed15..000000000
--- a/modules/entry/front/create/locale/es.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-New entry: Nueva entrada
-Required fields (*): Campos requeridos (*)
\ No newline at end of file
diff --git a/modules/entry/front/create/style.scss b/modules/entry/front/create/style.scss
deleted file mode 100644
index 2dc52b1ff..000000000
--- a/modules/entry/front/create/style.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-vn-entry-create {
- vn-card {
- position: relative
- }
- vn-icon[icon="info"] {
- position: absolute;
- top: 16px;
- right: 16px
- }
-}
\ No newline at end of file
diff --git a/modules/entry/front/descriptor-popover/index.html b/modules/entry/front/descriptor-popover/index.html
deleted file mode 100644
index 465a9bf51..000000000
--- a/modules/entry/front/descriptor-popover/index.html
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
\ No newline at end of file
diff --git a/modules/entry/front/descriptor-popover/index.js b/modules/entry/front/descriptor-popover/index.js
deleted file mode 100644
index d79aed03e..000000000
--- a/modules/entry/front/descriptor-popover/index.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import ngModule from '../module';
-import DescriptorPopover from 'salix/components/descriptor-popover';
-
-class Controller extends DescriptorPopover {}
-
-ngModule.vnComponent('vnEntryDescriptorPopover', {
- slotTemplate: require('./index.html'),
- controller: Controller
-});
diff --git a/modules/entry/front/descriptor/index.html b/modules/entry/front/descriptor/index.html
deleted file mode 100644
index 7b61a0cf5..000000000
--- a/modules/entry/front/descriptor/index.html
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-
- Show entry report
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/entry/front/descriptor/index.js b/modules/entry/front/descriptor/index.js
deleted file mode 100644
index 3452a6d34..000000000
--- a/modules/entry/front/descriptor/index.js
+++ /dev/null
@@ -1,99 +0,0 @@
-import ngModule from '../module';
-import Descriptor from 'salix/components/descriptor';
-
-class Controller extends Descriptor {
- get entry() {
- return this.entity;
- }
-
- set entry(value) {
- this.entity = value;
- }
-
- get travelFilter() {
- let travelFilter;
- const entryTravel = this.entry && this.entry.travel;
-
- if (entryTravel && entryTravel.agencyModeFk) {
- travelFilter = this.entry && JSON.stringify({
- agencyModeFk: entryTravel.agencyModeFk
- });
- }
- return travelFilter;
- }
-
- get entryFilter() {
- let entryTravel = this.entry && this.entry.travel;
-
- if (!entryTravel || !entryTravel.landed) return null;
-
- const date = new Date(entryTravel.landed);
- date.setHours(0, 0, 0, 0);
-
- const from = new Date(date.getTime());
- from.setDate(from.getDate() - 10);
-
- const to = new Date(date.getTime());
- to.setDate(to.getDate() + 10);
-
- return JSON.stringify({
- supplierFk: this.entry.supplierFk,
- from,
- to
- });
- }
-
- loadData() {
- const filter = {
- include: [
- {
- relation: 'travel',
- scope: {
- fields: ['id', 'landed', 'agencyModeFk', 'warehouseOutFk'],
- include: [
- {
- relation: 'agency',
- scope: {
- fields: ['name']
- }
- },
- {
- relation: 'warehouseOut',
- scope: {
- fields: ['name']
- }
- },
- {
- relation: 'warehouseIn',
- scope: {
- fields: ['name']
- }
- }
- ]
- }
- },
- {
- relation: 'supplier',
- scope: {
- fields: ['id', 'nickname']
- }
- }
- ]
- };
-
- return this.getData(`Entries/${this.id}`, {filter})
- .then(res => this.entity = res.data);
- }
-
- showEntryReport() {
- this.vnReport.show(`Entries/${this.id}/entry-order-pdf`);
- }
-}
-
-ngModule.vnComponent('vnEntryDescriptor', {
- template: require('./index.html'),
- controller: Controller,
- bindings: {
- entry: '<'
- }
-});
diff --git a/modules/entry/front/descriptor/index.spec.js b/modules/entry/front/descriptor/index.spec.js
deleted file mode 100644
index 714bb9f3c..000000000
--- a/modules/entry/front/descriptor/index.spec.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import './index.js';
-
-describe('Entry Component vnEntryDescriptor', () => {
- let $httpBackend;
- let controller;
- const entry = {id: 2};
-
- beforeEach(ngModule('entry'));
-
- beforeEach(inject(($componentController, _$httpBackend_) => {
- $httpBackend = _$httpBackend_;
- controller = $componentController('vnEntryDescriptor', {$element: null}, {entry});
- }));
-
- describe('showEntryReport()', () => {
- it('should open a new window showing a delivery note PDF document', () => {
- jest.spyOn(controller.vnReport, 'show');
-
- window.open = jasmine.createSpy('open');
- controller.showEntryReport();
- const expectedPath = `Entries/${entry.id}/entry-order-pdf`;
-
- expect(controller.vnReport.show).toHaveBeenCalledWith(expectedPath);
- });
- });
-
- describe('loadData()', () => {
- it('should perform ask for the entry', () => {
- let query = `Entries/${entry.id}`;
- jest.spyOn(controller, 'getData');
-
- $httpBackend.expectGET(query).respond();
- controller.loadData();
- $httpBackend.flush();
-
- expect(controller.getData).toHaveBeenCalledTimes(1);
- expect(controller.getData).toHaveBeenCalledWith(query, jasmine.any(Object));
- });
- });
-});
diff --git a/modules/entry/front/descriptor/locale/es.yml b/modules/entry/front/descriptor/locale/es.yml
deleted file mode 100644
index ad2fef6f3..000000000
--- a/modules/entry/front/descriptor/locale/es.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-Reference: Referencia
-Supplier card: Ficha del proveedor
-All travels with current agency: Todos los envios con la agencia actual
-All entries with current supplier: Todas las entradas con el proveedor actual
-Show entry report: Ver informe del pedido
-Is inventory entry: Es una entrada de inventario
-Is virtual entry: Es una redada
\ No newline at end of file
diff --git a/modules/entry/front/index.js b/modules/entry/front/index.js
index 88700b166..a7209a0bd 100644
--- a/modules/entry/front/index.js
+++ b/modules/entry/front/index.js
@@ -1,18 +1,3 @@
export * from './module';
import './main';
-import './index/';
-import './create';
-import './basic-data';
-import './latest-buys';
-import './search-panel';
-import './latest-buys-search-panel';
-import './descriptor';
-import './descriptor-popover';
-import './card';
-import './note';
-import './summary';
-import './log';
-import './buy/index';
-import './buy/import';
-
diff --git a/modules/entry/front/index/index.html b/modules/entry/front/index/index.html
deleted file mode 100644
index 42177be21..000000000
--- a/modules/entry/front/index/index.html
+++ /dev/null
@@ -1,85 +0,0 @@
-
-
-
-
-
-
-
- Id
- Landed
- Reference
- Invoice number
- Supplier
- Booked
- Confirmed
- Ordered
-
-
-
-
-
-
-
-
-
-
- {{::entry.id}}
-
-
- {{::entry.landed | date:'dd/MM/yyyy'}}
-
-
- {{::entry.reference}}
- {{::entry.invoiceNumber}}
- {{::entry.supplierName}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- >
-
-
-
-
-
-
- {{name}}: {{nickname}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Tags
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/modules/entry/front/latest-buys-search-panel/index.js b/modules/entry/front/latest-buys-search-panel/index.js
deleted file mode 100644
index 4078580ea..000000000
--- a/modules/entry/front/latest-buys-search-panel/index.js
+++ /dev/null
@@ -1,61 +0,0 @@
-import ngModule from '../module';
-import SearchPanel from 'core/components/searchbar/search-panel';
-import './style.scss';
-
-class Controller extends SearchPanel {
- constructor($element, $) {
- super($element, $);
- }
-
- $onInit() {
- this.filter = {
- isActive: true,
- tags: []
- };
- }
-
- changeCategory(id) {
- if (this.filter.categoryFk != id) {
- this.filter.categoryFk = id;
- this.addFilters();
- }
- }
-
- removeItemFilter(param) {
- this.filter[param] = null;
- if (param == 'categoryFk') this.filter['typeFk'] = null;
- this.addFilters();
- }
-
- removeTag(tag) {
- const index = this.filter.tags.indexOf(tag);
- if (index > -1) this.filter.tags.splice(index, 1);
- this.addFilters();
- }
-
- onKeyPress($event) {
- if ($event.key === 'Enter')
- this.addFilters();
- }
-
- addFilters() {
- for (let i = 0; i < this.filter.tags.length; i++) {
- if (!this.filter.tags[i].value)
- this.filter.tags.splice(i, 1);
- }
- return this.model.addFilter({}, this.filter);
- }
-
- showTagInfo(itemTag) {
- if (!itemTag.tagFk) return itemTag.value;
- return `${this.tags.find(tag => tag.id == itemTag.tagFk).name}: ${itemTag.value}`;
- }
-}
-
-ngModule.component('vnLatestBuysSearchPanel', {
- template: require('./index.html'),
- controller: Controller,
- bindings: {
- model: '<'
- }
-});
diff --git a/modules/entry/front/latest-buys-search-panel/index.spec.js b/modules/entry/front/latest-buys-search-panel/index.spec.js
deleted file mode 100644
index c3c5acbfb..000000000
--- a/modules/entry/front/latest-buys-search-panel/index.spec.js
+++ /dev/null
@@ -1,56 +0,0 @@
-import './index.js';
-
-describe('Entry', () => {
- describe('Component vnLatestBuysSearchPanel', () => {
- let $element;
- let controller;
-
- beforeEach(ngModule('entry'));
-
- beforeEach(angular.mock.inject($componentController => {
- $element = angular.element(`
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Edit
-
- {{::$ctrl.totalChecked}}
-
- buy(s)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/modules/entry/front/latest-buys/index.js b/modules/entry/front/latest-buys/index.js
deleted file mode 100644
index 292c5b805..000000000
--- a/modules/entry/front/latest-buys/index.js
+++ /dev/null
@@ -1,209 +0,0 @@
-import ngModule from '../module';
-import Section from 'salix/components/section';
-import './style.scss';
-
-export default class Controller extends Section {
- constructor($element, $) {
- super($element, $);
- this.editedColumn;
- this.checkAll = false;
- this.checkedBuys = [];
-
- this.smartTableOptions = {
- activeButtons: {
- search: true,
- shownColumns: true,
- },
- columns: [
- {
- field: 'code',
- autocomplete: {
- url: 'ItemTypes',
- showField: 'code',
- valueField: 'code',
- }
- },
- {
- field: 'origin',
- autocomplete: {
- url: 'Origins',
- showField: 'code',
- valueField: 'code'
- }
- },
- {
- field: 'family',
- autocomplete: {
- url: 'ItemFamilies',
- valueField: 'code',
- showField: 'code'
- }
- },
- {
- field: 'intrastat',
- autocomplete: {
- url: 'Intrastats',
- showField: 'description',
- valueField: 'description'
- }
- },
- {
- field: 'packagingFk',
- autocomplete: {
- url: 'Packagings',
- showField: 'id'
- }
- },
- {
- field: 'isActive',
- searchable: false
- },
- {
- field: 'isIgnored',
- searchable: false
- },
- {
- field: 'landing',
- searchable: false
- }
- ]
- };
- }
-
- get columns() {
- if (this._columns) return this._columns;
-
- this._columns = [
- {field: 'packing', displayName: this.$t('Packing')},
- {field: 'grouping', displayName: this.$t('Grouping')},
- {field: 'packageValue', displayName: this.$t('Package value')},
- {field: 'weight', displayName: this.$t('Weight')},
- {field: 'description', displayName: this.$t('Description')},
- {field: 'size', displayName: this.$t('Size')},
- {field: 'weightByPiece', displayName: this.$t('weight/Piece')},
- {field: 'packingOut', displayName: this.$t('PackingOut')},
- {field: 'landing', displayName: this.$t('Landing')}
- ];
-
- return this._columns;
- }
-
- get checked() {
- const buys = this.$.model.data || [];
- const checkedBuys = [];
- for (let buy of buys) {
- if (buy.checked)
- checkedBuys.push(buy);
- }
-
- return checkedBuys;
- }
-
- exprBuilder(param, value) {
- switch (param) {
- case 'id':
- case 'size':
- case 'weightByPiece':
- case 'isActive':
- case 'family':
- case 'minPrice':
- case 'packingOut':
- return {[`i.${param}`]: value};
- case 'name':
- case 'description':
- return {[`i.${param}`]: {like: `%${value}%`}};
- case 'code':
- return {'it.code': value};
- case 'intrastat':
- return {'intr.description': value};
- case 'origin':
- return {'ori.code': value};
- case 'landing':
- return {[`lb.${param}`]: value};
- case 'packing':
- case 'grouping':
- case 'quantity':
- case 'entryFk':
- case 'buyingValue':
- case 'freightValue':
- case 'comissionValue':
- case 'packageValue':
- case 'isIgnored':
- case 'price2':
- case 'price3':
- case 'ektFk':
- case 'weight':
- case 'packagingFk':
- return {[`b.${param}`]: value};
- }
- }
-
- uncheck() {
- this.checkAll = false;
- this.checkedBuys = [];
- }
-
- get totalChecked() {
- if (this.checkedDummyCount)
- return this.checkedDummyCount;
-
- return this.checked.length;
- }
-
- saveChecked(buyId) {
- const index = this.checkedBuys.indexOf(buyId);
- if (index !== -1)
- return this.checkedBuys.splice(index, 1);
- return this.checkedBuys.push(buyId);
- }
-
- reCheck() {
- if (!this.$.model.data) return;
- if (!this.checkedBuys.length) return;
-
- this.$.model.data.forEach(buy => {
- if (this.checkedBuys.includes(buy.id))
- buy.checked = true;
- });
- }
-
- onEditAccept() {
- const rowsToEdit = [];
- for (let row of this.checked)
- rowsToEdit.push({id: row.id, itemFk: row.itemFk});
-
- const data = {
- field: this.editedColumn.field,
- newValue: this.editedColumn.newValue,
- lines: rowsToEdit
- };
-
- if (this.checkedDummyCount && this.checkedDummyCount > 0) {
- const params = {};
- if (this.$.model.userParams) {
- const userParams = this.$.model.userParams;
- for (let param in userParams) {
- let newParam = this.exprBuilder(param, userParams[param]);
- if (!newParam)
- newParam = {[param]: userParams[param]};
- Object.assign(params, newParam);
- }
- }
- if (this.$.model.userFilter)
- Object.assign(params, this.$.model.userFilter.where);
-
- data.filter = params;
- }
-
- return this.$http.post('Buys/editLatestBuys', data)
- .then(() => {
- this.uncheck();
- this.$.model.refresh();
- });
- }
-}
-
-ngModule.component('vnEntryLatestBuys', {
- template: require('./index.html'),
- controller: Controller
-});
diff --git a/modules/entry/front/latest-buys/index.spec.js b/modules/entry/front/latest-buys/index.spec.js
deleted file mode 100644
index 6574303fc..000000000
--- a/modules/entry/front/latest-buys/index.spec.js
+++ /dev/null
@@ -1,100 +0,0 @@
-import './index.js';
-
-describe('Entry', () => {
- describe('Component vnEntryLatestBuys', () => {
- let controller;
- let $httpBackend;
-
- beforeEach(ngModule('entry'));
-
- beforeEach(angular.mock.inject(($componentController, $rootScope, _$httpBackend_) => {
- $httpBackend = _$httpBackend_;
- const $element = angular.element(' {}},
- edit: {hide: () => {}}
- };
- }));
-
- describe('get columns', () => {
- it(`should return a set of columns`, () => {
- let result = controller.columns;
-
- let length = result.length;
- let anyColumn = Object.keys(result[Math.floor(Math.random() * Math.floor(length))]);
-
- expect(anyColumn).toContain('field', 'displayName');
- });
- });
-
- describe('get checked', () => {
- it(`should return a set of checked lines`, () => {
- controller.$.model.data = [
- {checked: true, id: 1},
- {checked: true, id: 2},
- {checked: true, id: 3},
- {checked: false, id: 4},
- ];
-
- let result = controller.checked;
-
- expect(result.length).toEqual(3);
- });
- });
-
- describe('onEditAccept()', () => {
- it(`should perform a query to update columns`, () => {
- controller.editedColumn = {field: 'my field', newValue: 'the new value'};
- const query = 'Buys/editLatestBuys';
-
- $httpBackend.expectPOST(query).respond();
- controller.onEditAccept();
- $httpBackend.flush();
-
- const result = controller.checked;
-
- expect(result.length).toEqual(0);
- });
- });
-
- describe('reCheck()', () => {
- it(`should recheck buys`, () => {
- controller.$.model.data = [
- {checked: false, id: 1},
- {checked: false, id: 2},
- {checked: false, id: 3},
- {checked: false, id: 4},
- ];
- controller.checkedBuys = [1, 2];
-
- controller.reCheck();
-
- expect(controller.$.model.data[0].checked).toEqual(true);
- expect(controller.$.model.data[1].checked).toEqual(true);
- expect(controller.$.model.data[2].checked).toEqual(false);
- expect(controller.$.model.data[3].checked).toEqual(false);
- });
- });
-
- describe('saveChecked()', () => {
- it(`should check buy`, () => {
- const buyCheck = 3;
- controller.checkedBuys = [1, 2];
-
- controller.saveChecked(buyCheck);
-
- expect(controller.checkedBuys[2]).toEqual(buyCheck);
- });
-
- it(`should uncheck buy`, () => {
- const buyUncheck = 3;
- controller.checkedBuys = [1, 2, 3];
-
- controller.saveChecked(buyUncheck);
-
- expect(controller.checkedBuys[2]).toEqual(undefined);
- });
- });
- });
-});
diff --git a/modules/entry/front/latest-buys/locale/en.yml b/modules/entry/front/latest-buys/locale/en.yml
deleted file mode 100644
index 48dda861b..000000000
--- a/modules/entry/front/latest-buys/locale/en.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-Minimun amount: Minimun purchase quantity
-PackageName: Package
\ No newline at end of file
diff --git a/modules/entry/front/latest-buys/locale/es.yml b/modules/entry/front/latest-buys/locale/es.yml
deleted file mode 100644
index 795e3f5f4..000000000
--- a/modules/entry/front/latest-buys/locale/es.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-Edit buy(s): Editar compra(s)
-Buying value: Coste
-Freight value: Porte
-Commission value: Comisión
-Package value: Embalaje
-Is ignored: Ignorado
-Is visible: Visible
-Is floramondo: Floramondo
-Grouping price: Precio grouping
-Packing price: Precio packing
-Min price: Precio min
-Ekt: Ekt
-Weight: Peso
-Minimun amount: Cantidad mínima de compra
-Field to edit: Campo a editar
-PackageName: Cubo
-Edit: Editar
-buy(s): compra(s)
-Package out: Embalaje envíos
diff --git a/modules/entry/front/latest-buys/style.scss b/modules/entry/front/latest-buys/style.scss
deleted file mode 100644
index a3c399edc..000000000
--- a/modules/entry/front/latest-buys/style.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-.countLines {
- flex: 0.15;
- font-size: 24px;
- color: orangered;
- font-weight: bold;
- max-width: 30px;
-}
diff --git a/modules/entry/front/locale/es.yml b/modules/entry/front/locale/es.yml
deleted file mode 100644
index b28cbe735..000000000
--- a/modules/entry/front/locale/es.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-#Ordenar alfabeticamente
-
-entry: entrada
-Latest buys: Últimas compras
-
-# Sections
diff --git a/modules/entry/front/log/index.html b/modules/entry/front/log/index.html
deleted file mode 100644
index fd8ae7c2a..000000000
--- a/modules/entry/front/log/index.html
+++ /dev/null
@@ -1 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/entry/front/note/index.js b/modules/entry/front/note/index.js
deleted file mode 100644
index fccd60913..000000000
--- a/modules/entry/front/note/index.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import ngModule from '../module';
-import Section from 'salix/components/section';
-
-class Controller extends Section {
- onSubmit() {
- this.$.watcher.check();
- this.$.model.save().then(() => {
- this.$.watcher.notifySaved();
- this.$.watcher.updateOriginalData();
- });
- }
-}
-
-ngModule.vnComponent('vnEntryObservation', {
- template: require('./index.html'),
- controller: Controller,
- bindings: {
- entry: '<'
- }
-});
diff --git a/modules/entry/front/routes.json b/modules/entry/front/routes.json
index 3934a96ee..53c599cf1 100644
--- a/modules/entry/front/routes.json
+++ b/modules/entry/front/routes.json
@@ -8,12 +8,6 @@
"main": [
{"state": "entry.index", "icon": "icon-entry"},
{"state": "entry.latestBuys", "icon": "contact_support"}
- ],
- "card": [
- {"state": "entry.card.basicData", "icon": "settings"},
- {"state": "entry.card.buy.index", "icon": "icon-lines"},
- {"state": "entry.card.observation", "icon": "insert_drive_file"},
- {"state": "entry.card.log", "icon": "history"}
]
},
"keybindings": [
@@ -33,90 +27,6 @@
"component": "vn-entry-index",
"description": "Entries",
"acl": ["buyer", "administrative"]
- },
- {
- "url": "/latest-buys?q",
- "state": "entry.latestBuys",
- "component": "vn-entry-latest-buys",
- "description": "Latest buys",
- "acl": ["buyer", "administrative"]
- },
- {
- "url": "/create?supplierFk&travelFk&companyFk",
- "state": "entry.create",
- "component": "vn-entry-create",
- "description": "New entry",
- "acl": ["buyer", "administrative"]
- },
- {
- "url": "/:id",
- "state": "entry.card",
- "abstract": true,
- "component": "vn-entry-card"
- },
- {
- "url": "/summary",
- "state": "entry.card.summary",
- "component": "vn-entry-summary",
- "description": "Summary",
- "params": {
- "entry": "$ctrl.entry"
- },
- "acl": ["buyer", "administrative"]
- },
- {
- "url": "/basic-data",
- "state": "entry.card.basicData",
- "component": "vn-entry-basic-data",
- "description": "Basic data",
- "params": {
- "entry": "$ctrl.entry"
- },
- "acl": ["buyer", "administrative"]
- },
- {
- "url": "/observation",
- "state": "entry.card.observation",
- "component": "vn-entry-observation",
- "description": "Notes",
- "params": {
- "entry": "$ctrl.entry"
- },
- "acl": ["buyer", "administrative"]
- },
- {
- "url" : "/log",
- "state": "entry.card.log",
- "component": "vn-entry-log",
- "description": "Log",
- "acl": ["buyer", "administrative"]
- },
- {
- "url": "/buy",
- "state": "entry.card.buy",
- "abstract": true,
- "component": "ui-view",
- "acl": ["buyer"]
- },
- {
- "url" : "/index",
- "state": "entry.card.buy.index",
- "component": "vn-entry-buy-index",
- "description": "Buys",
- "params": {
- "entry": "$ctrl.entry"
- },
- "acl": ["buyer", "administrative"]
- },
- {
- "url" : "/import",
- "state": "entry.card.buy.import",
- "component": "vn-entry-buy-import",
- "description": "Import buys",
- "params": {
- "entry": "$ctrl.entry"
- },
- "acl": ["buyer"]
}
]
-}
\ No newline at end of file
+}
diff --git a/modules/entry/front/search-panel/index.html b/modules/entry/front/search-panel/index.html
deleted file mode 100644
index adcb9d6d4..000000000
--- a/modules/entry/front/search-panel/index.html
+++ /dev/null
@@ -1,100 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{$ctrl.entryData.travel.ref}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/modules/entry/front/summary/index.js b/modules/entry/front/summary/index.js
deleted file mode 100644
index 6e18bc959..000000000
--- a/modules/entry/front/summary/index.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import ngModule from '../module';
-import './style.scss';
-import Summary from 'salix/components/summary';
-
-class Controller extends Summary {
- get entry() {
- if (!this._entry)
- return this.$params;
-
- return this._entry;
- }
-
- set entry(value) {
- this._entry = value;
-
- if (value && value.id)
- this.getEntryData();
- }
-
- getEntryData() {
- return this.$http.get(`Entries/${this.entry.id}/getEntry`).then(response => {
- this.entryData = response.data;
- });
- }
-}
-
-ngModule.vnComponent('vnEntrySummary', {
- template: require('./index.html'),
- controller: Controller,
- bindings: {
- entry: '<'
- }
-});
diff --git a/modules/entry/front/summary/index.spec.js b/modules/entry/front/summary/index.spec.js
deleted file mode 100644
index baeb43ac8..000000000
--- a/modules/entry/front/summary/index.spec.js
+++ /dev/null
@@ -1,49 +0,0 @@
-import './index';
-
-describe('component vnEntrySummary', () => {
- let controller;
- let $httpBackend;
- let $scope;
-
- beforeEach(angular.mock.module('entry', $translateProvider => {
- $translateProvider.translations('en', {});
- }));
-
- beforeEach(inject(($componentController, $rootScope, _$httpBackend_, _$httpParamSerializer_) => {
- $httpBackend = _$httpBackend_;
- $scope = $rootScope.$new();
- const $element = angular.element(` {
Self.remoteMethodCtx('download', {
@@ -66,7 +67,7 @@ module.exports = Self => {
console.error(err);
});
- if (process.env.NODE_ENV == 'test') {
+ if (!isProduction()) {
try {
await fs.access(file.path);
} catch (error) {
diff --git a/modules/invoiceOut/back/methods/invoiceOut/invoiceOutPdf.js b/modules/invoiceOut/back/methods/invoiceOut/invoiceOutPdf.js
index 941d31596..f4bb6baa9 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/invoiceOutPdf.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/invoiceOutPdf.js
@@ -31,7 +31,8 @@ module.exports = Self => {
http: {
path: '/:reference/invoice-out-pdf',
verb: 'GET'
- }
+ },
+ accessScopes: ['DEFAULT', 'read:multimedia']
});
Self.invoiceOutPdf = async(ctx, reference) => {
diff --git a/modules/invoiceOut/back/methods/invoiceOut/negativeBases.js b/modules/invoiceOut/back/methods/invoiceOut/negativeBases.js
index fc8830885..76ef29604 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/negativeBases.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/negativeBases.js
@@ -59,7 +59,7 @@ module.exports = Self => {
`CREATE OR REPLACE TEMPORARY TABLE tmp.filter
ENGINE = MEMORY
SELECT co.code company,
- cou.country,
+ cou.name country,
c.id clientId,
c.socialName clientSocialName,
u.nickname workerSocialName,
diff --git a/modules/invoiceOut/back/methods/invoiceOut/specs/book.spec.js b/modules/invoiceOut/back/methods/invoiceOut/specs/book.spec.js
index 3af7542ca..bebc9a8e4 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/specs/book.spec.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/specs/book.spec.js
@@ -1,7 +1,7 @@
const models = require('vn-loopback/server/server').models;
describe('invoiceOut book()', () => {
- const ctx = {req: {accessToken: {userId: 9}}};
+ const ctx = beforeAll.getCtx();
const invoiceOutId = 5;
it('should update the booked property', async() => {
diff --git a/modules/invoiceOut/back/methods/invoiceOut/specs/transferinvoice.spec.js b/modules/invoiceOut/back/methods/invoiceOut/specs/transferinvoice.spec.js
index eaaef3e26..22787e730 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/specs/transferinvoice.spec.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/specs/transferinvoice.spec.js
@@ -1,4 +1,3 @@
-
const models = require('vn-loopback/server/server').models;
const LoopBackContext = require('loopback-context');
@@ -17,26 +16,27 @@ describe('InvoiceOut transferInvoice()', () => {
spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
active: activeCtx
});
- spyOn(models.InvoiceOut, 'makePdfAndNotify');
});
it('should return the id of the created issued invoice', async() => {
const tx = await models.InvoiceOut.beginTransaction({});
const options = {transaction: tx};
- const args = {
- id: '4',
- refFk: 'T4444444',
- newClientFk: 1,
- cplusRectificationTypeFk: 1,
- siiTypeInvoiceOutFk: 1,
- invoiceCorrectionTypeFk: 1
- };
- ctx.args = args;
+ const id = 4;
+ const newClient = 1;
+ spyOn(models.InvoiceOut, 'makePdfList');
+
try {
- const {clientFk: oldClient} = await models.InvoiceOut.findById(args.id, {fields: ['clientFk']});
+ const {clientFk: oldClient} = await models.InvoiceOut.findById(id, {fields: ['clientFk']});
const invoicesBefore = await models.InvoiceOut.find({}, options);
const result = await models.InvoiceOut.transferInvoice(
ctx,
+ id,
+ 'T4444444',
+ newClient,
+ 1,
+ 1,
+ 1,
+ true,
options);
const invoicesAfter = await models.InvoiceOut.find({}, options);
const rectificativeInvoice = invoicesAfter[invoicesAfter.length - 2];
@@ -45,7 +45,7 @@ describe('InvoiceOut transferInvoice()', () => {
expect(result).toBeDefined();
expect(invoicesAfter.length - invoicesBefore.length).toEqual(2);
expect(rectificativeInvoice.clientFk).toEqual(oldClient);
- expect(newInvoice.clientFk).toEqual(args.newClientFk);
+ expect(newInvoice.clientFk).toEqual(newClient);
await tx.rollback();
} catch (e) {
@@ -54,22 +54,13 @@ describe('InvoiceOut transferInvoice()', () => {
}
});
- it('should throw an UserError when it is the same client', async() => {
+ it('should throw an error when it is the same client', async() => {
const tx = await models.InvoiceOut.beginTransaction({});
const options = {transaction: tx};
- const args = {
- id: '1',
- refFk: 'T1111111',
- newClientFk: 1101,
- cplusRectificationTypeFk: 1,
- siiTypeInvoiceOutFk: 1,
- invoiceCorrectionTypeFk: 1
- };
- ctx.args = args;
+ spyOn(models.InvoiceOut, 'makePdfList');
+
try {
- await models.InvoiceOut.transferInvoice(
- ctx,
- options);
+ await models.InvoiceOut.transferInvoice(ctx, '1', 'T1111111', 1101, 1, 1, 1, true, options);
await tx.rollback();
} catch (e) {
expect(e.message).toBe(`Select a different client`);
@@ -77,26 +68,49 @@ describe('InvoiceOut transferInvoice()', () => {
}
});
- it('should throw an UserError when it is refund', async() => {
+ it('should throw an error when it is refund', async() => {
const tx = await models.InvoiceOut.beginTransaction({});
const options = {transaction: tx};
- const args = {
- id: '1',
- refFk: 'T1111111',
- newClientFk: 1102,
- cplusRectificationTypeFk: 1,
- siiTypeInvoiceOutFk: 1,
- invoiceCorrectionTypeFk: 1
- };
- ctx.args = args;
+ spyOn(models.InvoiceOut, 'makePdfList');
try {
- await models.InvoiceOut.transferInvoice(
- ctx,
- options);
+ await models.InvoiceOut.transferInvoice(ctx, '1', 'T1111111', 1102, 1, 1, 1, true, options);
await tx.rollback();
} catch (e) {
expect(e.message).toContain(`This ticket is already a refund`);
await tx.rollback();
}
});
+
+ it('should throw an error when pdf failed', async() => {
+ const tx = await models.InvoiceOut.beginTransaction({});
+ const options = {transaction: tx};
+ spyOn(models.InvoiceOut, 'makePdfList').and.returnValue(() => {
+ throw new Error('test');
+ });
+
+ try {
+ await models.InvoiceOut.transferInvoice(ctx, '1', 'T1111111', 1102, 1, 1, 1, true, options);
+ await tx.rollback();
+ } catch (e) {
+ expect(e.message).toContain(`It has been invoiced but the PDF could not be generated`);
+ await tx.rollback();
+ }
+ });
+
+ it('should not generate an invoice', async() => {
+ const tx = await models.InvoiceOut.beginTransaction({});
+ const options = {transaction: tx};
+ spyOn(models.InvoiceOut, 'makePdfList');
+
+ let response;
+ try {
+ response = await models.InvoiceOut.transferInvoice(ctx, '1', 'T1111111', 1102, 1, 1, 1, false, options);
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+
+ expect(response).not.toBeDefined();
+ });
});
diff --git a/modules/invoiceOut/back/methods/invoiceOut/transferInvoice.js b/modules/invoiceOut/back/methods/invoiceOut/transferInvoice.js
index b5eb9bed5..0c86e5810 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/transferInvoice.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/transferInvoice.js
@@ -37,13 +37,13 @@ module.exports = Self => {
required: true
},
{
- arg: 'checked',
+ arg: 'makeInvoice',
type: 'boolean',
required: true
},
],
returns: {
- type: 'boolean',
+ type: 'object',
root: true
},
http: {
@@ -52,11 +52,22 @@ module.exports = Self => {
}
});
- Self.transferInvoice = async(ctx, options) => {
+ Self.transferInvoice = async(
+ ctx,
+ id,
+ refFk,
+ newClientFk,
+ cplusRectificationTypeFk,
+ siiTypeInvoiceOutFk,
+ invoiceCorrectionTypeFk,
+ makeInvoice,
+ options
+ ) => {
const models = Self.app.models;
const myOptions = {userId: ctx.req.accessToken.userId};
- const {id, refFk, newClientFk, cplusRectificationTypeFk, siiTypeInvoiceOutFk, invoiceCorrectionTypeFk} = ctx.args;
- const checked = ctx.args.checked;
+ let invoiceId;
+ let refundId;
+
let tx;
if (typeof options == 'object')
Object.assign(myOptions, options);
@@ -100,15 +111,29 @@ module.exports = Self => {
};
const refundTicketIds = refundTickets.map(ticket => ticket.id);
- await models.Ticket.invoiceTickets(ctx, refundTicketIds, invoiceCorrection, myOptions);
+ refundId = await models.Ticket.invoiceTickets(ctx, refundTicketIds, invoiceCorrection, myOptions);
- if (!checked) {
- const [invoiceId] = await models.Ticket.invoiceTicketsAndPdf(ctx, clonedTicketIds, null, myOptions);
- return invoiceId;
- }
+ if (makeInvoice)
+ invoiceId = await models.Ticket.invoiceTickets(ctx, clonedTicketIds, null, myOptions);
+
+ tx && await tx.commit();
} catch (e) {
if (tx) await tx.rollback();
throw e;
}
+
+ if (tx && makeInvoice) {
+ try {
+ await models.InvoiceOut.makePdfList(ctx, invoiceId);
+ } catch (e) {
+ throw new UserError('It has been invoiced but the PDF could not be generated');
+ }
+ try {
+ await models.InvoiceOut.makePdfList(ctx, refundId);
+ } catch (e) {
+ throw new UserError('It has been invoiced but the PDF of refund not be generated');
+ }
+ }
+ return invoiceId;
};
};
diff --git a/modules/invoiceOut/back/models/invoice-out.js b/modules/invoiceOut/back/models/invoice-out.js
index e4fcc1a69..b0e05b626 100644
--- a/modules/invoiceOut/back/models/invoice-out.js
+++ b/modules/invoiceOut/back/models/invoice-out.js
@@ -1,6 +1,7 @@
const print = require('vn-print');
const path = require('path');
const UserError = require('vn-loopback/util/user-error');
+const isProduction = require('vn-loopback/server/boot/isProduction');
module.exports = Self => {
require('../methods/invoiceOut/filter')(Self);
@@ -59,7 +60,7 @@ module.exports = Self => {
hasPdf: true
}, options);
- if (process.env.NODE_ENV !== 'test') {
+ if (isProduction()) {
await print.storage.write(buffer, {
type: 'invoice',
path: pdfFile.path,
diff --git a/modules/invoiceOut/back/models/invoice-out.json b/modules/invoiceOut/back/models/invoice-out.json
index 2bf5182e8..1ee36accb 100644
--- a/modules/invoiceOut/back/models/invoice-out.json
+++ b/modules/invoiceOut/back/models/invoice-out.json
@@ -44,6 +44,11 @@
"model": "Client",
"foreignKey": "clientFk"
},
+ "user": {
+ "type": "belongsTo",
+ "model": "VnUser",
+ "foreignKey": "clientFk"
+ },
"company": {
"type": "belongsTo",
"model": "Company",
diff --git a/modules/invoiceOut/front/descriptor-menu/index.js b/modules/invoiceOut/front/descriptor-menu/index.js
index 0d7fb32dd..8ea4507ec 100644
--- a/modules/invoiceOut/front/descriptor-menu/index.js
+++ b/modules/invoiceOut/front/descriptor-menu/index.js
@@ -158,7 +158,7 @@ class Controller extends Section {
cplusRectificationTypeFk: this.cplusRectificationType,
siiTypeInvoiceOutFk: this.siiTypeInvoiceOut,
invoiceCorrectionTypeFk: this.invoiceCorrectionType,
- checked: this.checked
+ makeInvoice: this.checked
};
this.$http.get(`Clients/${this.clientId}`).then(response => {
diff --git a/modules/invoiceOut/front/index/manual/index.html b/modules/invoiceOut/front/index/manual/index.html
index 5872911e4..3b991618d 100644
--- a/modules/invoiceOut/front/index/manual/index.html
+++ b/modules/invoiceOut/front/index/manual/index.html
@@ -27,7 +27,7 @@
{
const now = Date.vnNew();
const fixedPriceId = 1;
let originalFixedPrice;
+ beforeAll.mockLoopBackContext();
beforeAll(async() => {
originalFixedPrice = await models.FixedPrice.findById(fixedPriceId);
- const activeCtx = {
- accessToken: {userId: 9},
- http: {
- req: {
- headers: {origin: 'http://localhost'}
- }
- }
- };
- spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
- active: activeCtx
- });
});
it(`should toggle the hasMinPrice boolean if there's a minPrice and update the rest of the data`, async() => {
diff --git a/modules/item/back/methods/item-barcode/toItem.js b/modules/item/back/methods/item-barcode/toItem.js
index 96e9d5981..d189b77c3 100644
--- a/modules/item/back/methods/item-barcode/toItem.js
+++ b/modules/item/back/methods/item-barcode/toItem.js
@@ -4,7 +4,7 @@ module.exports = Self => {
accessType: 'READ',
accepts: [{
arg: 'barcode',
- type: 'number',
+ type: 'string',
required: true,
description: 'barcode'
}],
@@ -18,7 +18,7 @@ module.exports = Self => {
}
});
- Self.toItem = async(barcode, options) => {
+ Self.toItem = async (barcode, options) => {
const myOptions = {};
if (typeof options == 'object')
diff --git a/modules/item/back/methods/item-shelving/getListItemNewer.js b/modules/item/back/methods/item-shelving/getListItemNewer.js
new file mode 100644
index 000000000..dafefe712
--- /dev/null
+++ b/modules/item/back/methods/item-shelving/getListItemNewer.js
@@ -0,0 +1,70 @@
+module.exports = Self => {
+ Self.remoteMethod('getListItemNewer', {
+ description:
+ 'Get boolean if any or specific item of the shelving has older created in another shelving or parking',
+ accessType: 'READ',
+ accepts: [{
+ arg: 'shelvingFk',
+ type: 'string',
+ required: true,
+ description: 'Shelving code'
+ },
+ {
+ arg: 'parking',
+ type: 'string',
+ required: true,
+ description: 'Parking code'
+ },
+ ],
+ returns: {
+ type: 'Array',
+ root: true
+ },
+ http: {
+ path: `/getListItemNewer`,
+ verb: 'GET'
+ }
+ });
+
+ Self.getListItemNewer = async(shelvingFk, parking, options) => {
+ const myOptions = {};
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
+
+ const [isParkingToReview] = await Self.rawSql(`
+ SELECT COUNT(p.id) parkingToReview
+ FROM vn.parking p
+ JOIN vn.sector s ON s.id = p.sectorFk
+ JOIN vn.productionConfig pc
+ WHERE p.code = ? AND s.code = pc.sectorToCode;`,
+ [parking], myOptions);
+
+ if (isParkingToReview['parkingToReview'] < 1) return [];
+
+ const result = await Self.rawSql(`
+ WITH tItemShelving AS(
+ SELECT is2.itemFk, is2.created, p.sectorFK, is2.id
+ FROM vn.itemShelving is2
+ JOIN vn.shelving sh ON sh.code = is2.shelvingFk
+ JOIN vn.parking p ON p.id = sh.parkingFk
+ JOIN vn.sector s ON s.id = p.sectorFk
+ JOIN vn.productionConfig pc
+ WHERE is2.shelvingFk = ? AND s.code = pc.sectorFromCode
+ ), tItemInSector AS (
+ SELECT is2.itemFk, is2.created, is2.shelvingFk
+ FROM vn.itemShelving is2
+ JOIN vn.shelving sh ON sh.code = is2.shelvingFk
+ JOIN vn.parking p ON p.id = sh.parkingFk
+ JOIN vn.sector s ON s.id = p.sectorFk
+ JOIN vn.productionConfig pc
+ WHERE is2.shelvingFk <> ?
+ AND s.code = pc.sectorFromCode)
+ SELECT ti.itemFK, tis.shelvingFk
+ FROM tItemShelving ti
+ JOIN tItemInSector tis ON tis.itemFk = ti.itemFk
+ JOIN vn.productionConfig pc
+ WHERE ti.created + INTERVAL pc.itemOlderReviewHours HOUR < tis.created ;`,
+ [shelvingFk, shelvingFk], myOptions);
+ return result;
+ };
+};
diff --git a/modules/item/back/methods/item-shelving/hasItemOlder.js b/modules/item/back/methods/item-shelving/hasItemOlder.js
deleted file mode 100644
index ee4cdc829..000000000
--- a/modules/item/back/methods/item-shelving/hasItemOlder.js
+++ /dev/null
@@ -1,63 +0,0 @@
-const UserError = require('vn-loopback/util/user-error');
-module.exports = Self => {
- Self.remoteMethod('hasItemOlder', {
- description:
- 'Get boolean if any or specific item of the shelving has older created in another shelving or parking',
- accessType: 'READ',
- accepts: [{
- arg: 'shelvingFkIn',
- type: 'string',
- required: true,
- description: 'Shelving code'
- },
- {
- arg: 'parking',
- type: 'string',
- description: 'Parking code'
- },
- {
- arg: 'shelvingFkOut',
- type: 'string',
- description: 'Shelving code'
- },
- {
- arg: 'itemFk',
- type: 'integer',
- description: 'Item id'
- }],
- returns: {
- type: 'boolean',
- root: true
- },
- http: {
- path: `/hasItemOlder`,
- verb: 'GET'
- }
- });
-
- Self.hasItemOlder = async(shelvingFkIn, parking, shelvingFkOut, itemFk, options) => {
- if (!parking && !shelvingFkOut) throw new UserError('Missing data: parking or shelving');
-
- const myOptions = {};
- if (typeof options == 'object')
- Object.assign(myOptions, options);
-
- const result = await Self.rawSql(`
- SELECT COUNT(ish.id) countItemOlder
- FROM vn.itemShelving ish
- JOIN (
- SELECT ish.itemFk, created,shelvingFk
- FROM vn.itemShelving ish
- JOIN vn.shelving s ON ish.shelvingFk = s.code
- WHERE ish.shelvingFk = ?
- )sub ON sub.itemFK = ish.itemFk
- JOIN vn.shelving s ON s.code = ish.shelvingFk
- JOIN vn.parking p ON p.id = s.parkingFk
- WHERE sub.created > ish.created
- AND (p.code <> ? OR ? IS NULL)
- AND (ish.shelvingFk <> ? OR ? IS NULL)
- AND (ish.itemFk <> ? OR ? IS NULL)`,
- [shelvingFkIn, parking, parking, shelvingFkOut, shelvingFkOut, itemFk, itemFk], myOptions);
- return result[0]['countItemOlder'] > 0;
- };
-};
diff --git a/modules/item/back/methods/item-shelving/specs/getAlternative.spec.js b/modules/item/back/methods/item-shelving/specs/getAlternative.spec.js
index 3f4917477..3b0a65e61 100644
--- a/modules/item/back/methods/item-shelving/specs/getAlternative.spec.js
+++ b/modules/item/back/methods/item-shelving/specs/getAlternative.spec.js
@@ -1,13 +1,7 @@
const {models} = require('vn-loopback/server/server');
describe('itemShelving getAlternative()', () => {
- beforeAll(async() => {
- ctx = {
- req: {
- headers: {origin: 'http://localhost'},
- }
- };
- });
+ beforeAll.mockLoopBackContext();
it('should return a list of items without alternatives', async() => {
const shelvingFk = 'HEJ';
diff --git a/modules/item/back/methods/item-shelving/specs/getListItemNewer.spec.js b/modules/item/back/methods/item-shelving/specs/getListItemNewer.spec.js
new file mode 100644
index 000000000..962863095
--- /dev/null
+++ b/modules/item/back/methods/item-shelving/specs/getListItemNewer.spec.js
@@ -0,0 +1,32 @@
+
+const {models} = require('vn-loopback/server/server');
+
+describe('itemShelving getListItemNewer()', () => {
+ it('should return true because there is an older item', async() => {
+ const shelving = 'NBB';
+ const parking = '700-01';
+
+ const sectorCamHighCode = 'FIRST';
+ const sectorCamCode = 'NS';
+
+ const tx = await models.Sector.beginTransaction({});
+ const myOptions = {transaction: tx};
+
+ try {
+ const config = await models.ProductionConfig.findOne();
+
+ await config.updateAttributes({
+ sectorToCode: sectorCamHighCode,
+ sectorFromCode: sectorCamCode
+ });
+
+ const result = await models.ItemShelving.getListItemNewer(shelving, parking, myOptions);
+
+ expect(result.length).toEqual(3);
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+});
diff --git a/modules/item/back/methods/item-shelving/specs/hasItemOlder.spec.js b/modules/item/back/methods/item-shelving/specs/hasItemOlder.spec.js
deleted file mode 100644
index abffead53..000000000
--- a/modules/item/back/methods/item-shelving/specs/hasItemOlder.spec.js
+++ /dev/null
@@ -1,45 +0,0 @@
-
-const {models} = require('vn-loopback/server/server');
-
-describe('itemShelving hasOlder()', () => {
- it('should return false because there are not older items', async() => {
- const shelvingFkIn = 'GVC';
- const shelvingFkOut = 'HEJ';
- const result = await models.ItemShelving.hasItemOlder(shelvingFkIn, null, shelvingFkOut);
-
- expect(result).toBe(false);
- });
-
- it('should return false because there are not older items in parking', async() => {
- const shelvingFkIn = 'HEJ';
- const parking = '700-01';
- const result = await models.ItemShelving.hasItemOlder(shelvingFkIn, parking);
-
- expect(result).toBe(false);
- });
-
- it('should return true because there is an older item', async() => {
- const shelvingFkIn = 'UXN';
- const shelvingFkOut = 'PCC';
- const parking = 'A-01-1';
- const itemFk = 1;
-
- const tx = await models.ItemShelving.beginTransaction({});
- const myOptions = {transaction: tx};
- const filter = {where: {shelvingFk: shelvingFkOut}
- };
- try {
- const itemShelvingBefore = await models.ItemShelving.findOne(filter, myOptions);
- await itemShelvingBefore.updateAttributes({
- itemFk: itemFk
- }, myOptions);
- const result = await models.ItemShelving.hasItemOlder(shelvingFkIn, parking, null, null, myOptions);
-
- expect(result).toBe(true);
- await tx.rollback();
- } catch (e) {
- await tx.rollback();
- throw e;
- }
- });
-});
diff --git a/modules/item/back/methods/item-shelving/specs/upsertItem.spec.js b/modules/item/back/methods/item-shelving/specs/upsertItem.spec.js
index 2dd43224c..f01cb985d 100644
--- a/modules/item/back/methods/item-shelving/specs/upsertItem.spec.js
+++ b/modules/item/back/methods/item-shelving/specs/upsertItem.spec.js
@@ -1,25 +1,13 @@
const {models} = require('vn-loopback/server/server');
-const LoopBackContext = require('loopback-context');
describe('ItemShelving upsertItem()', () => {
const warehouseFk = 1;
- let ctx;
+
+ const ctx = beforeAll.getCtx();
let options;
let tx;
beforeEach(async() => {
- ctx = {
- req: {
- accessToken: {userId: 9},
- headers: {origin: 'http://localhost'}
- },
- args: {}
- };
-
- spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
- active: ctx.req
- });
-
options = {transaction: tx};
tx = await models.ItemShelving.beginTransaction({});
options.transaction = tx;
diff --git a/modules/item/back/methods/item/getSummary.js b/modules/item/back/methods/item/getSummary.js
index 17a38cf07..55222f133 100644
--- a/modules/item/back/methods/item/getSummary.js
+++ b/modules/item/back/methods/item/getSummary.js
@@ -59,7 +59,7 @@ module.exports = Self => {
include: [{
relation: 'country',
scope: {
- fields: ['id', 'country']
+ fields: ['id', 'name']
}
}, {
relation: 'taxClass',
diff --git a/modules/item/back/methods/item/labelPdf.js b/modules/item/back/methods/item/labelPdf.js
index c2462353d..d7a50397e 100644
--- a/modules/item/back/methods/item/labelPdf.js
+++ b/modules/item/back/methods/item/labelPdf.js
@@ -51,7 +51,8 @@ module.exports = Self => {
http: {
path: '/:id/label-pdf',
verb: 'GET'
- }
+ },
+ accessScopes: ['DEFAULT', 'read:multimedia']
});
Self.labelPdf = (ctx, id) => Self.printReport(ctx, id, 'item-label');
diff --git a/modules/item/back/methods/item/specs/clone.spec.js b/modules/item/back/methods/item/specs/clone.spec.js
index 01210677e..5bb5fe560 100644
--- a/modules/item/back/methods/item/specs/clone.spec.js
+++ b/modules/item/back/methods/item/specs/clone.spec.js
@@ -1,21 +1,8 @@
const models = require('vn-loopback/server/server').models;
-const LoopBackContext = require('loopback-context');
describe('item clone()', () => {
let nextItemId;
- beforeAll(async() => {
- const activeCtx = {
- accessToken: {userId: 9},
- http: {
- req: {
- headers: {origin: 'http://localhost'}
- }
- }
- };
- spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
- active: activeCtx
- });
- });
+ beforeAll.mockLoopBackContext();
beforeEach(async() => {
let query = `SELECT i1.id + 1 as id FROM vn.item i1
diff --git a/modules/item/back/methods/item/specs/getBalance.spec.js b/modules/item/back/methods/item/specs/getBalance.spec.js
index 5e5148595..bae0997bb 100644
--- a/modules/item/back/methods/item/specs/getBalance.spec.js
+++ b/modules/item/back/methods/item/specs/getBalance.spec.js
@@ -2,17 +2,14 @@ const models = require('vn-loopback/server/server').models;
const LoopBackContext = require('loopback-context');
describe('item getBalance()', () => {
- const ctx = {req: {accessToken: {userId: 9}}};
+ const ctx = beforeAll.getCtx();
it('should return the balance lines of a client type loses in which one has highlighted true', async() => {
const tx = await models.Item.beginTransaction({});
const options = {transaction: tx};
try {
- const activeCtx = {
- accessToken: {userId: 9},
- };
spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
- active: activeCtx
+ active: ctx
});
const losesClientId = 1111;
const ticket = await models.Ticket.findById(7, null, options);
@@ -64,7 +61,7 @@ describe('item getBalance()', () => {
const secondItemBalance = await models.Item.getBalance(ctx, secondFilter, options);
expect(firstItemBalance[9].claimFk).toEqual(null);
- expect(secondItemBalance[4].claimFk).toEqual(2);
+ expect(secondItemBalance[7].claimFk).toEqual(2);
await tx.rollback();
} catch (e) {
diff --git a/modules/item/back/methods/item/specs/new.spec.js b/modules/item/back/methods/item/specs/new.spec.js
index 2ffaf87a5..11570ffb9 100644
--- a/modules/item/back/methods/item/specs/new.spec.js
+++ b/modules/item/back/methods/item/specs/new.spec.js
@@ -1,21 +1,7 @@
const models = require('vn-loopback/server/server').models;
-const LoopBackContext = require('loopback-context');
describe('item new()', () => {
- const ctx = {req: {accessToken: {userId: 9}}};
- beforeAll(async() => {
- const activeCtx = {
- accessToken: {userId: 9},
- http: {
- req: {
- headers: {origin: 'http://localhost'}
- }
- }
- };
- spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
- active: activeCtx
- });
- });
+ const ctx = beforeAll.getCtx();
it('should create a new item, adding the name as a tag', async() => {
const tx = await models.Item.beginTransaction({});
diff --git a/modules/item/back/methods/item/specs/regularize.spec.js b/modules/item/back/methods/item/specs/regularize.spec.js
index e7df9a003..4e94d5d6d 100644
--- a/modules/item/back/methods/item/specs/regularize.spec.js
+++ b/modules/item/back/methods/item/specs/regularize.spec.js
@@ -1,27 +1,13 @@
const models = require('vn-loopback/server/server').models;
-const LoopBackContext = require('loopback-context');
describe('regularize()', () => {
- beforeAll(async() => {
- const activeCtx = {
- accessToken: {userId: 18},
- http: {
- req: {
- headers: {origin: 'http://localhost'}
- }
- }
- };
- spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
- active: activeCtx
- });
- });
+ const ctx = beforeAll.mockLoopBackContext(18);
it('should create a new ticket and add a line', async() => {
const tx = await models.Item.beginTransaction({});
const options = {transaction: tx};
try {
- const ctx = {req: {accessToken: {userId: 18}}};
const itemId = 1;
const warehouseId = 1;
const quantity = 11;
diff --git a/modules/item/back/methods/item/specs/updateTaxes.spec.js b/modules/item/back/methods/item/specs/updateTaxes.spec.js
index 793e43de8..828a5fec9 100644
--- a/modules/item/back/methods/item/specs/updateTaxes.spec.js
+++ b/modules/item/back/methods/item/specs/updateTaxes.spec.js
@@ -1,20 +1,7 @@
const models = require('vn-loopback/server/server').models;
-const LoopBackContext = require('loopback-context');
describe('item updateTaxes()', () => {
- beforeAll(async() => {
- const activeCtx = {
- accessToken: {userId: 9},
- http: {
- req: {
- headers: {origin: 'http://localhost'}
- }
- }
- };
- spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
- active: activeCtx
- });
- });
+ beforeAll.mockLoopBackContext();
it('should throw an error if the taxClassFk is blank', async() => {
const tx = await models.Item.beginTransaction({});
diff --git a/modules/item/back/methods/tag/specs/onSubmit.spec.js b/modules/item/back/methods/tag/specs/onSubmit.spec.js
index 1e96d9e81..e92a5fcdf 100644
--- a/modules/item/back/methods/tag/specs/onSubmit.spec.js
+++ b/modules/item/back/methods/tag/specs/onSubmit.spec.js
@@ -1,20 +1,7 @@
const models = require('vn-loopback/server/server').models;
-const LoopBackContext = require('loopback-context');
describe('tag onSubmit()', () => {
- beforeAll(async() => {
- const activeCtx = {
- accessToken: {userId: 9},
- http: {
- req: {
- headers: {origin: 'http://localhost'}
- }
- }
- };
- spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
- active: activeCtx
- });
- });
+ beforeAll.mockLoopBackContext();
it('should delete a tag', async() => {
const tx = await models.Item.beginTransaction({});
diff --git a/modules/item/back/model-config.json b/modules/item/back/model-config.json
index 40d73f1a6..2d06e1ada 100644
--- a/modules/item/back/model-config.json
+++ b/modules/item/back/model-config.json
@@ -50,6 +50,9 @@
"ItemShelving": {
"dataSource": "vn"
},
+ "ItemShelvingLog": {
+ "dataSource": "vn"
+ },
"ItemShelvingSale": {
"dataSource": "vn"
},
@@ -74,4 +77,4 @@
"FixedPrice": {
"dataSource": "vn"
}
-}
+}
\ No newline at end of file
diff --git a/modules/item/back/models/expense.json b/modules/item/back/models/expense.json
index 468063602..e661cbc66 100644
--- a/modules/item/back/models/expense.json
+++ b/modules/item/back/models/expense.json
@@ -9,7 +9,7 @@
"properties": {
"id": {
"id": true,
- "type": "number",
+ "type": "string",
"description": "Identifier"
},
"name": {
diff --git a/modules/item/back/models/item-shelving-log.json b/modules/item/back/models/item-shelving-log.json
new file mode 100644
index 000000000..f976008f1
--- /dev/null
+++ b/modules/item/back/models/item-shelving-log.json
@@ -0,0 +1,52 @@
+{
+ "name": "ItemShelvingLog",
+ "base": "VnModel",
+ "mixins": {
+ "Loggable": true
+ },
+ "options": {
+ "mysql": {
+ "table": "itemShelvingLog"
+ }
+ },
+ "properties": {
+ "id": {
+ "type": "number",
+ "id": true,
+ "description": "Identifier"
+ },
+ "created": {
+ "type": "date"
+ },
+ "shelvingFk": {
+ "type": "string"
+ },
+ "itemFk": {
+ "type": "number"
+ },
+ "visible": {
+ "type": "number"
+ },
+ "accion": {
+ "type": "string"
+ }
+ },
+ "relations": {
+ "item": {
+ "type": "belongsTo",
+ "model": "Item",
+ "foreignKey": "itemFk"
+ },
+ "worker": {
+ "type": "belongsTo",
+ "model": "Worker",
+ "foreignKey": "workerFk"
+ },
+ "shelving": {
+ "type": "belongsTo",
+ "model": "Shelving",
+ "foreignKey": "shelvingFk",
+ "primaryKey": "code"
+ }
+ }
+}
\ No newline at end of file
diff --git a/modules/item/back/models/item-shelving.js b/modules/item/back/models/item-shelving.js
index d48ee10d5..be72dac37 100644
--- a/modules/item/back/models/item-shelving.js
+++ b/modules/item/back/models/item-shelving.js
@@ -4,5 +4,5 @@ module.exports = Self => {
require('../methods/item-shelving/getInventory')(Self);
require('../methods/item-shelving/getAlternative')(Self);
require('../methods/item-shelving/updateFromSale')(Self);
- require('../methods/item-shelving/hasItemOlder')(Self);
+ require('../methods/item-shelving/getListItemNewer')(Self);
};
diff --git a/modules/item/back/models/item.json b/modules/item/back/models/item.json
index 9d48dcbfb..10cff3e04 100644
--- a/modules/item/back/models/item.json
+++ b/modules/item/back/models/item.json
@@ -155,6 +155,9 @@
"minQuantity": {
"type": "number",
"description": "Min quantity"
+ },
+ "photoMotivation": {
+ "type": "string"
}
},
"relations": {
diff --git a/modules/item/front/routes.json b/modules/item/front/routes.json
index 3dea69ba1..4b7cd1490 100644
--- a/modules/item/front/routes.json
+++ b/modules/item/front/routes.json
@@ -3,7 +3,7 @@
"name": "Items",
"icon": "icon-item",
"validations" : true,
- "dependencies": ["worker", "client", "ticket", "entry"],
+ "dependencies": ["worker", "client", "ticket"],
"menus": {
"main": [
{"state": "item.index", "icon": "icon-item"},
@@ -19,8 +19,8 @@
{"state": "item.card.tax", "icon": "icon-tax"},
{"state": "item.card.botanical", "icon": "local_florist"},
{"state": "item.card.shelving", "icon": "icon-inventory"},
- {"state": "item.card.itemBarcode", "icon": "icon-barcode"},
- {"state": "item.card.diary", "icon": "icon-transaction"},
+ {"state": "item.card.itemBarcode", "icon": "icon-barcode"},
+ {"state": "item.card.diary", "icon": "icon-transaction"},
{"state": "item.card.log", "icon": "history"}
],
"itemType": [
@@ -227,4 +227,4 @@
"acl": ["buyer"]
}
]
-}
\ No newline at end of file
+}
diff --git a/modules/item/front/summary/index.html b/modules/item/front/summary/index.html
index 5fe84591f..13c671d29 100644
--- a/modules/item/front/summary/index.html
+++ b/modules/item/front/summary/index.html
@@ -181,7 +181,7 @@
ng-show="!$ctrl.isBuyer && !$ctrl.isAdministrative">
Tax
-
diff --git a/modules/item/front/tax/index.html b/modules/item/front/tax/index.html
index e993f974f..78858704f 100644
--- a/modules/item/front/tax/index.html
+++ b/modules/item/front/tax/index.html
@@ -15,7 +15,7 @@
{
Self.remoteMethodCtx('upload', {
@@ -111,7 +112,7 @@ module.exports = Self => {
const destinationFile = path.join(
accessContainer.client.root, accessContainer.name, appName, `${toVersion}.7z`);
- if (process.env.NODE_ENV == 'test')
+ if (!isProduction())
await fs.unlink(srcFile);
else {
await fs.move(srcFile, destinationFile, {
diff --git a/modules/monitor/back/methods/sales-monitor/salesFilter.js b/modules/monitor/back/methods/sales-monitor/salesFilter.js
index 301e4ac35..33b37d8a4 100644
--- a/modules/monitor/back/methods/sales-monitor/salesFilter.js
+++ b/modules/monitor/back/methods/sales-monitor/salesFilter.js
@@ -162,7 +162,7 @@ module.exports = Self => {
const stmts = [];
let stmt;
-
+
stmts.push(`SET @_optimizer_search_depth = @@optimizer_search_depth`);
stmts.push(`SET SESSION optimizer_search_depth = 0`);
diff --git a/modules/monitor/back/methods/sales-monitor/specs/salesFilter.spec.js b/modules/monitor/back/methods/sales-monitor/specs/salesFilter.spec.js
index bdafd14e2..c3da7f08b 100644
--- a/modules/monitor/back/methods/sales-monitor/specs/salesFilter.spec.js
+++ b/modules/monitor/back/methods/sales-monitor/specs/salesFilter.spec.js
@@ -151,7 +151,7 @@ describe('SalesMonitor salesFilter()', () => {
const result = await models.SalesMonitor.salesFilter(ctx, filter, options);
const firstRow = result[0];
- expect(result.length).toEqual(12);
+ expect(result.length).toEqual(15);
expect(firstRow.alertLevel).not.toEqual(0);
await tx.rollback();
diff --git a/modules/order/back/methods/order-row/specs/addToOrder.spec.js b/modules/order/back/methods/order-row/specs/addToOrder.spec.js
index 96544a1a9..2bc78ffef 100644
--- a/modules/order/back/methods/order-row/specs/addToOrder.spec.js
+++ b/modules/order/back/methods/order-row/specs/addToOrder.spec.js
@@ -1,7 +1,7 @@
const models = require('vn-loopback/server/server').models;
describe('order addToOrder()', () => {
- const ctx = {req: {accessToken: {userId: 9}}};
+ const ctx = beforeAll.getCtx();
const orderId = 8;
it('should add a row to a given order', async() => {
const tx = await models.Order.beginTransaction({});
diff --git a/modules/order/back/methods/order/specs/filter.spec.js b/modules/order/back/methods/order/specs/filter.spec.js
index 68de7fe04..9e644bb2d 100644
--- a/modules/order/back/methods/order/specs/filter.spec.js
+++ b/modules/order/back/methods/order/specs/filter.spec.js
@@ -1,11 +1,7 @@
const models = require('vn-loopback/server/server').models;
describe('order filter()', () => {
- const ctx = {
- req: {accessToken: {userId: 9}},
- args: {},
- params: {}
- };
+ const ctx = beforeAll.getCtx();
it('should call the filter method with a basic search', async() => {
const myCtx = Object.assign({}, ctx);
diff --git a/modules/order/back/methods/order/specs/new.spec.js b/modules/order/back/methods/order/specs/new.spec.js
index c43527f66..779de6ada 100644
--- a/modules/order/back/methods/order/specs/new.spec.js
+++ b/modules/order/back/methods/order/specs/new.spec.js
@@ -2,7 +2,7 @@ const models = require('vn-loopback/server/server').models;
const UserError = require('vn-loopback/util/user-error');
describe('order new()', () => {
- const ctx = {req: {accessToken: {userId: 9}}};
+ const ctx = beforeAll.getCtx();
it('should throw an error if the client isnt active', async() => {
const tx = await models.Order.beginTransaction({});
diff --git a/modules/order/back/methods/order/specs/newFromTicket.spec.js b/modules/order/back/methods/order/specs/newFromTicket.spec.js
index c509552fe..d927a0338 100644
--- a/modules/order/back/methods/order/specs/newFromTicket.spec.js
+++ b/modules/order/back/methods/order/specs/newFromTicket.spec.js
@@ -1,7 +1,7 @@
const models = require('vn-loopback/server/server').models;
describe('order newFromTicket()', () => {
- const ctx = {req: {accessToken: {userId: 9}}};
+ const ctx = beforeAll.getCtx();
it('should create a new order from an existing ticket', async() => {
const tx = await models.Order.beginTransaction({});
diff --git a/modules/route/back/locale/routesMonitor/en.yml b/modules/route/back/locale/routesMonitor/en.yml
index 8908ee636..c28c5cb4d 100644
--- a/modules/route/back/locale/routesMonitor/en.yml
+++ b/modules/route/back/locale/routesMonitor/en.yml
@@ -13,7 +13,6 @@ columns:
m3: m3
priority: priority
etd: etd
- expeditionTruckFk: truck
m3boxes: m3 boxes
bufferFk: buffer
- isPickingAllowed: is picking allowed
\ No newline at end of file
+ isPickingAllowed: is picking allowed
diff --git a/modules/route/back/locale/routesMonitor/es.yml b/modules/route/back/locale/routesMonitor/es.yml
index 9ded8983d..a8e807626 100644
--- a/modules/route/back/locale/routesMonitor/es.yml
+++ b/modules/route/back/locale/routesMonitor/es.yml
@@ -13,7 +13,6 @@ columns:
m3: m3
priority: prioridad
etd: etd
- expeditionTruckFk: camión
m3boxes: m3 cajas
bufferFk: buffer
- isPickingAllowed: está permitido recoger
\ No newline at end of file
+ isPickingAllowed: está permitido recoger
diff --git a/modules/route/back/methods/agency-term/specs/createInvoiceIn.spec.js b/modules/route/back/methods/agency-term/specs/createInvoiceIn.spec.js
index d3a0755ef..24ffa9cd7 100644
--- a/modules/route/back/methods/agency-term/specs/createInvoiceIn.spec.js
+++ b/modules/route/back/methods/agency-term/specs/createInvoiceIn.spec.js
@@ -1,21 +1,7 @@
const models = require('vn-loopback/server/server').models;
-const LoopBackContext = require('loopback-context');
describe('AgencyTerm createInvoiceIn()', () => {
- const ctx = {req: {accessToken: {userId: 9}}};
- beforeAll(async() => {
- const activeCtx = {
- accessToken: {userId: 9},
- http: {
- req: {
- headers: {origin: 'http://localhost'}
- }
- }
- };
- spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
- active: activeCtx
- });
- });
+ const ctx = beforeAll.getCtx();
const rows = [
{
routeFk: 2,
diff --git a/modules/route/back/methods/roadmap/clone.js b/modules/route/back/methods/roadmap/clone.js
index 456ed823d..5f1ab9229 100644
--- a/modules/route/back/methods/roadmap/clone.js
+++ b/modules/route/back/methods/roadmap/clone.js
@@ -37,17 +37,12 @@ module.exports = Self => {
fields: [
'id',
'name',
- 'tractorPlate',
- 'trailerPlate',
- 'phone',
'supplierFk',
- 'etd',
- 'observations',
- 'price'],
+ 'etd'],
include: [{
- relation: 'expeditionTruck',
+ relation: 'roadmapStop',
scope: {
- fields: ['roadmapFk', 'warehouseFk', 'eta', 'description']
+ fields: ['roadmapFk', 'addressFk', 'eta', 'description']
}
}]
@@ -62,12 +57,12 @@ module.exports = Self => {
const clone = await models.Roadmap.create(roadmap, options);
- const expeditionTrucks = roadmap.expeditionTruck();
- expeditionTrucks.map(expeditionTruck => {
- expeditionTruck.roadmapFk = clone.id;
- return expeditionTruck;
+ const roadmapStops = roadmap.roadmapStop();
+ roadmapStops.map(roadmapStop => {
+ roadmapStop.roadmapFk = clone.id;
+ return roadmapStop;
});
- await models.ExpeditionTruck.create(expeditionTrucks, options);
+ await models.RoadmapStop.create(roadmapStops, options);
}
await tx.commit();
diff --git a/modules/route/back/methods/roadmapStop/getPalletMatchState.js b/modules/route/back/methods/roadmapStop/getPalletMatchState.js
new file mode 100644
index 000000000..f47669993
--- /dev/null
+++ b/modules/route/back/methods/roadmapStop/getPalletMatchState.js
@@ -0,0 +1,62 @@
+module.exports = Self => {
+ Self.remoteMethod('getPalletMatchState', {
+ description: 'Get list of pallet from truckFk with true or false if state is matched',
+ accessType: 'WRITE',
+ accepts: [{
+ arg: 'truckFk',
+ type: 'number',
+ required: true,
+ description: 'The truckFk id'
+ },
+ {
+ arg: 'state',
+ type: 'string',
+ required: true,
+ description: 'State code'
+ }],
+ returns: {
+ type: 'object',
+ root: true
+ },
+ http: {
+ path: `/getPalletMatchState`,
+ verb: 'GET'
+ }
+ });
+
+ Self.getPalletMatchState = async(truckFk, state, options) => {
+ const myOptions = {};
+
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
+
+ const result = await Self.rawSql(`
+ WITH tPallet AS(
+ SELECT ep.id pallet, e.id expedition, e.stateTypeFk
+ FROM vn.expeditionPallet ep
+ JOIN vn.expeditionScan es ON es.palletFk = ep.id
+ JOIN expedition e ON e.id = es.expeditionFk
+ WHERE ep.truckFk = ?
+ ),totalPalletExpedition AS(
+ SELECT t.*, COUNT(expedition) totalPalletExpedition
+ FROM tPallet t
+ GROUP BY expedition
+ ),totalPalletExpeditionCode AS(
+ SELECT t.*, COUNT(expedition) totalPalletExpeditionCode
+ FROM tPallet t
+ JOIN vn.expeditionStateType est ON est.id = t.stateTypeFk
+ WHERE code = ?
+ GROUP BY expedition
+ )
+ SELECT t.pallet,
+ tpe.totalPalletExpedition = tpec.totalPalletExpeditionCode hasMatchStateCode
+ FROM tPallet t
+ LEFT JOIN totalPalletExpedition tpe ON tpe.expedition = t.expedition
+ LEFT JOIN totalPalletExpeditionCode tpec ON tpec.expedition = t.expedition
+ GROUP BY t.pallet;`,
+ [truckFk, state],
+ myOptions);
+
+ return result;
+ };
+};
diff --git a/modules/route/back/methods/roadmapStop/specs/getPalletMatchState.spec.js b/modules/route/back/methods/roadmapStop/specs/getPalletMatchState.spec.js
new file mode 100644
index 000000000..3152f666d
--- /dev/null
+++ b/modules/route/back/methods/roadmapStop/specs/getPalletMatchState.spec.js
@@ -0,0 +1,11 @@
+const {models} = require('vn-loopback/server/server');
+
+describe('roadMapStop getPalletMatchState()', () => {
+ it('should return list of pallet with true or false if state is matched', async() => {
+ const truckFk = 1;
+ const state = 'ON DELIVERY';
+ const result = await models.RoadmapStop.getPalletMatchState(truckFk, state);
+
+ expect(result[0].hasMatchStateCode).toBe(1);
+ });
+});
diff --git a/modules/route/back/methods/route/getExternalCmrs.js b/modules/route/back/methods/route/cmrs.js
similarity index 85%
rename from modules/route/back/methods/route/getExternalCmrs.js
rename to modules/route/back/methods/route/cmrs.js
index b8cd1041a..0c25cbca5 100644
--- a/modules/route/back/methods/route/getExternalCmrs.js
+++ b/modules/route/back/methods/route/cmrs.js
@@ -3,8 +3,8 @@ const buildFilter = require('vn-loopback/util/filter').buildFilter;
const mergeFilters = require('vn-loopback/util/filter').mergeFilters;
module.exports = Self => {
- Self.remoteMethod('getExternalCmrs', {
- description: 'Returns an array of external cmrs',
+ Self.remoteMethod('cmrs', {
+ description: 'Returns an array of cmrs',
accessType: 'READ',
accepts: [
{
@@ -47,37 +47,25 @@ module.exports = Self => {
type: 'date',
description: 'The to date filter',
},
+ {
+ arg: 'warehouseFk',
+ type: 'integer',
+ }
],
returns: {
type: ['object'],
root: true
},
http: {
- path: `/getExternalCmrs`,
+ path: `/cmrs`,
verb: 'GET'
}
});
- Self.getExternalCmrs = async(
- filter,
- cmrFk,
- ticketFk,
- routeFk,
- country,
- clientFk,
- hasCmrDms,
- shipped,
- options
+ Self.cmrs = async(
+ filter, cmrFk, ticketFk, routeFk, country, clientFk, hasCmrDms, shipped, warehouseFk, options
) => {
- const params = {
- cmrFk,
- ticketFk,
- routeFk,
- country,
- clientFk,
- hasCmrDms,
- shipped,
- };
+ const params = {cmrFk, ticketFk, routeFk, country, clientFk, hasCmrDms, warehouseFk, shipped};
const conn = Self.dataSource.connector;
let where = buildFilter(params, (param, value) => {
@@ -103,10 +91,11 @@ module.exports = Self => {
SELECT t.cmrFk,
t.id ticketFk,
t.routeFk,
- co.country,
+ co.name country,
t.clientFk,
IF(sub.id, TRUE, FALSE) hasCmrDms,
- DATE(t.shipped) shipped
+ DATE(t.shipped) shipped,
+ t.warehouseFk
FROM ticket t
JOIN ticketState ts ON ts.ticketFk = t.id
JOIN state s ON s.id = ts.stateFk
@@ -124,8 +113,7 @@ module.exports = Self => {
JOIN dmsType dt ON dt.id = d.dmsTypeFk
WHERE dt.name = 'cmr'
) sub ON sub.ticketFk = t.id
- WHERE co.code <> 'ES'
- AND am.name <> 'ABONO'
+ WHERE am.name <> 'ABONO'
AND w.code = 'ALG'
AND t.cmrFk
) sub
diff --git a/modules/route/back/methods/route/downloadCmrsZip.js b/modules/route/back/methods/route/downloadCmrsZip.js
index c6934edca..895ff7a16 100644
--- a/modules/route/back/methods/route/downloadCmrsZip.js
+++ b/modules/route/back/methods/route/downloadCmrsZip.js
@@ -41,14 +41,16 @@ module.exports = Self => {
if (typeof options == 'object')
Object.assign(myOptions, options);
- ids = ids.split(',');
-
- for (const id of ids) {
+ const downloadAddZip = async id => {
ctx.args = ctx.args || {};
ctx.args.id = Number(id);
const [data] = await models.Route.cmr(ctx, myOptions);
zip.file(`${id}.pdf`, data, {binary: true});
- }
+ };
+
+ ids = ids.split(',');
+ const promises = ids.map(id => downloadAddZip(id));
+ await Promise.all(promises);
const zipStream = zip.generateNodeStream({streamFiles: true});
return [zipStream, 'application/zip', `filename="cmrs.zip"`];
};
diff --git a/modules/route/back/methods/route/getTickets.js b/modules/route/back/methods/route/getTickets.js
index 0e7c9fe20..c0b952b70 100644
--- a/modules/route/back/methods/route/getTickets.js
+++ b/modules/route/back/methods/route/getTickets.js
@@ -87,10 +87,6 @@ module.exports = Self => {
const where = filter.where;
where['r.id'] = filter.id;
- where.and = [{or: [
- {'t.packages': {gt: 0}},
- {and: [{'ot.code': 'delivery'}, {'tob.observationTypeFk': {neq: null}}]}
- ]}];
stmt.merge(conn.makeWhere(filter.where));
stmt.merge(conn.makeGroupBy('t.id'));
diff --git a/modules/route/back/methods/route/specs/clone.spec.js b/modules/route/back/methods/route/specs/clone.spec.js
index 496ae1c89..a064e35ba 100644
--- a/modules/route/back/methods/route/specs/clone.spec.js
+++ b/modules/route/back/methods/route/specs/clone.spec.js
@@ -1,21 +1,7 @@
const app = require('vn-loopback/server/server');
-const LoopBackContext = require('loopback-context');
describe('route clone()', () => {
- beforeAll(async() => {
- const activeCtx = {
- accessToken: {userId: 9},
- http: {
- req: {
- headers: {origin: 'http://localhost'}
- }
- }
- };
-
- spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
- active: activeCtx
- });
- });
+ beforeAll.mockLoopBackContext();
const createdDate = Date.vnNew();
it('should throw an error if the amount of ids pased to the clone function do no match the database', async() => {
diff --git a/modules/route/back/methods/route/specs/guessPriority.spec.js b/modules/route/back/methods/route/specs/guessPriority.spec.js
index 902647ba1..522801f43 100644
--- a/modules/route/back/methods/route/specs/guessPriority.spec.js
+++ b/modules/route/back/methods/route/specs/guessPriority.spec.js
@@ -1,20 +1,9 @@
const app = require('vn-loopback/server/server');
-const LoopBackContext = require('loopback-context');
describe('route guessPriority()', () => {
const targetRouteId = 7;
let routeTicketsToRestore;
-
- const activeCtx = {
- accessToken: {userId: 9},
- __: () => {}
- };
-
- beforeAll(() => {
- spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
- active: activeCtx
- });
- });
+ const ctx = beforeAll.getCtx();
afterAll(async() => {
let restoreFixtures = [];
@@ -25,9 +14,6 @@ describe('route guessPriority()', () => {
});
it('should call guessPriority() then check all tickets in that route have their priorities defined', async() => {
- const ctx = {
- req: activeCtx
- };
routeTicketsToRestore = await app.models.Ticket.find({where: {routeFk: targetRouteId}});
await app.models.Route.guessPriority(ctx, targetRouteId);
diff --git a/modules/route/back/methods/route/specs/updateWorkCenter.spec.js b/modules/route/back/methods/route/specs/updateWorkCenter.spec.js
index a1c716299..b4b9253f8 100644
--- a/modules/route/back/methods/route/specs/updateWorkCenter.spec.js
+++ b/modules/route/back/methods/route/specs/updateWorkCenter.spec.js
@@ -1,20 +1,7 @@
const models = require('vn-loopback/server/server').models;
-const LoopBackContext = require('loopback-context');
describe('route updateWorkCenter()', () => {
- beforeAll(async() => {
- const activeCtx = {
- accessToken: {userId: 9},
- http: {
- req: {
- headers: {origin: 'http://localhost'}
- }
- }
- };
- spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
- active: activeCtx
- });
- });
+ beforeAll.mockLoopBackContext();
const routeId = 1;
it('should set the commission work center if the worker has workCenter', async() => {
diff --git a/modules/route/back/model-config.json b/modules/route/back/model-config.json
index 6cf8da986..ccae87bd9 100644
--- a/modules/route/back/model-config.json
+++ b/modules/route/back/model-config.json
@@ -8,7 +8,10 @@
"DeliveryPoint": {
"dataSource": "vn"
},
- "ExpeditionTruck": {
+ "RoadmapAddress": {
+ "dataSource": "vn"
+ },
+ "RoadmapStop": {
"dataSource": "vn"
},
"Roadmap": {
diff --git a/modules/route/back/models/roadmap.json b/modules/route/back/models/roadmap.json
index 2f6bb8c02..1434b1602 100644
--- a/modules/route/back/models/roadmap.json
+++ b/modules/route/back/models/roadmap.json
@@ -3,7 +3,7 @@
"base": "VnModel",
"options": {
"mysql": {
- "table": "roadmap"
+ "table": "roadmap"
}
},
"properties": {
@@ -41,10 +41,22 @@
},
"driverName": {
"type": "string"
+ },
+ "kmStart": {
+ "type": "number"
+ },
+ "kmEnd": {
+ "type": "number"
+ },
+ "started": {
+ "type": "date"
+ },
+ "finished": {
+ "type": "date"
}
},
- "relations": {
- "worker": {
+ "relations": {
+ "worker": {
"type": "belongsTo",
"model": "Worker",
"foreignKey": "id"
@@ -54,10 +66,10 @@
"model": "Supplier",
"foreignKey": "supplierFk"
},
- "expeditionTruck": {
+ "roadmapStop": {
"type": "hasMany",
- "model": "ExpeditionTruck",
+ "model": "RoadmapStop",
"foreignKey": "roadmapFk"
}
- }
+ }
}
diff --git a/modules/route/back/models/roadmapAddress.json b/modules/route/back/models/roadmapAddress.json
new file mode 100644
index 000000000..0241ce0d8
--- /dev/null
+++ b/modules/route/back/models/roadmapAddress.json
@@ -0,0 +1,26 @@
+{
+ "name": "RoadmapAddress",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "roadmapAddress"
+ }
+ },
+ "properties": {
+ "addressFk": {
+ "type": "number",
+ "id": true,
+ "description": "Identifier"
+ },
+ "isActive": {
+ "type": "number"
+ }
+ },
+ "relations": {
+ "address": {
+ "type": "belongsTo",
+ "model": "Address",
+ "foreignKey": "addressFk"
+ }
+ }
+}
diff --git a/modules/route/back/models/roadmapStop.js b/modules/route/back/models/roadmapStop.js
new file mode 100644
index 000000000..9e286776d
--- /dev/null
+++ b/modules/route/back/models/roadmapStop.js
@@ -0,0 +1,3 @@
+module.exports = Self => {
+ require('../methods/roadmapStop/getPalletMatchState')(Self);
+};
diff --git a/modules/route/back/models/expedition-truck.json b/modules/route/back/models/roadmapStop.json
similarity index 74%
rename from modules/route/back/models/expedition-truck.json
rename to modules/route/back/models/roadmapStop.json
index 8edc7347f..d34cee6e5 100644
--- a/modules/route/back/models/expedition-truck.json
+++ b/modules/route/back/models/roadmapStop.json
@@ -1,9 +1,9 @@
{
- "name": "ExpeditionTruck",
+ "name": "RoadmapStop",
"base": "VnModel",
"options": {
"mysql": {
- "table": "expeditionTruck"
+ "table": "roadmapStop"
}
},
"properties": {
@@ -15,7 +15,7 @@
"roadmapFk": {
"type": "number"
},
- "warehouseFk": {
+ "addressFk": {
"type": "number"
},
"eta": {
@@ -28,16 +28,16 @@
"type": "number"
}
},
- "relations": {
- "roadmap": {
+ "relations": {
+ "roadmap": {
"type": "belongsTo",
"model": "Roadmap",
"foreignKey": "roadmapFk"
},
- "warehouse": {
+ "address": {
"type": "belongsTo",
- "model": "Warehouse",
- "foreignKey": "warehouseFk"
+ "model": "RoadmapAddress",
+ "foreignKey": "addressFk"
}
- }
+ }
}
diff --git a/modules/route/back/models/route.js b/modules/route/back/models/route.js
index bf1f26e74..242623d6e 100644
--- a/modules/route/back/models/route.js
+++ b/modules/route/back/models/route.js
@@ -15,26 +15,9 @@ module.exports = Self => {
require('../methods/route/sendSms')(Self);
require('../methods/route/downloadZip')(Self);
require('../methods/route/cmr')(Self);
- require('../methods/route/getExternalCmrs')(Self);
+ require('../methods/route/cmrs')(Self);
require('../methods/route/downloadCmrsZip')(Self);
require('../methods/route/cmrEmail')(Self);
require('../methods/route/getExpeditionSummary')(Self);
require('../methods/route/getByWorker')(Self);
-
- Self.validate('kmStart', validateDistance, {
- message: 'Distance must be lesser than 4000'
- });
-
- Self.validate('kmEnd', validateDistance, {
- message: 'Distance must be lesser than 4000'
- });
-
- function validateDistance(err) {
- if (this.kmEnd) {
- const routeTotalKm = this.kmEnd - this.kmStart;
- const routeMaxKm = 4000;
- if (routeTotalKm > routeMaxKm || this.kmStart > this.kmEnd)
- err();
- }
- }
};
diff --git a/modules/route/back/models/routesMonitor.json b/modules/route/back/models/routesMonitor.json
index 122026336..c5fe4c1ce 100644
--- a/modules/route/back/models/routesMonitor.json
+++ b/modules/route/back/models/routesMonitor.json
@@ -48,7 +48,7 @@
"priority": {
"type": "number"
},
- "expeditionTruckFk": {
+ "roadmapStopFk": {
"type": "number"
},
"m3boxes": {
diff --git a/modules/route/front/roadmap/stops/index.html b/modules/route/front/roadmap/stops/index.html
index b69492a21..82f30c326 100644
--- a/modules/route/front/roadmap/stops/index.html
+++ b/modules/route/front/roadmap/stops/index.html
@@ -1,22 +1,22 @@
@@ -61,9 +61,9 @@
-
- {{expeditionTruck.warehouse.name}}
- {{expeditionTruck.eta | date:'dd/MM/yyyy HH:mm'}}
+
+ {{roadmapStop.warehouse.name}}
+ {{roadmapStop.eta | date:'dd/MM/yyyy HH:mm'}}
@@ -75,14 +75,14 @@
+ ng-model="$ctrl.roadmapStop.eta">
diff --git a/modules/route/front/roadmap/summary/index.js b/modules/route/front/roadmap/summary/index.js
index 041b43ce3..46abe5ca2 100644
--- a/modules/route/front/roadmap/summary/index.js
+++ b/modules/route/front/roadmap/summary/index.js
@@ -20,7 +20,7 @@ class Controller extends Component {
include: [
{relation: 'supplier'},
{relation: 'worker'},
- {relation: 'expeditionTruck',
+ {relation: 'roadmapStop',
scope: {
include: [
{relation: 'warehouse'}
@@ -36,19 +36,19 @@ class Controller extends Component {
const eta = new Date(this.roadmap.etd);
eta.setDate(eta.getDate() + 1);
- this.expeditionTruck = {eta: eta};
+ this.roadmapStop = {eta: eta};
}
onAddAccept() {
try {
const data = {
roadmapFk: this.roadmap.id,
- warehouseFk: this.expeditionTruck.warehouseFk,
- eta: this.expeditionTruck.eta,
- description: this.expeditionTruck.description
+ warehouseFk: this.roadmapStop.warehouseFk,
+ eta: this.roadmapStop.eta,
+ description: this.roadmapStop.description
};
- this.$http.post(`ExpeditionTrucks`, data)
+ this.$http.post(`RoadmapStops`, data)
.then(() => {
this.loadData();
this.vnApp.showSuccess(this.$t('Data saved!'));
diff --git a/modules/shelving/back/model-config.json b/modules/shelving/back/model-config.json
index 89a0832b0..6f3ffb5ea 100644
--- a/modules/shelving/back/model-config.json
+++ b/modules/shelving/back/model-config.json
@@ -11,6 +11,12 @@
"Sector": {
"dataSource": "vn"
},
+ "SectorCollection": {
+ "dataSource": "vn"
+ },
+ "SectorCollectionSaleGroup": {
+ "dataSource": "vn"
+ },
"Train": {
"dataSource": "vn"
}
diff --git a/modules/shelving/back/models/sectorCollection.json b/modules/shelving/back/models/sectorCollection.json
new file mode 100644
index 000000000..bf2cc7985
--- /dev/null
+++ b/modules/shelving/back/models/sectorCollection.json
@@ -0,0 +1,24 @@
+{
+ "name": "SectorCollection",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "sectorCollection"
+ }
+ },
+ "properties": {
+ "id": {
+ "type": "number",
+ "id": true
+ },
+ "created": {
+ "type": "date"
+ },
+ "userFk": {
+ "type": "number"
+ },
+ "sectorFk": {
+ "type": "number"
+ }
+ }
+}
diff --git a/modules/shelving/back/models/sectorCollectionSaleGroup.json b/modules/shelving/back/models/sectorCollectionSaleGroup.json
new file mode 100644
index 000000000..421bdc885
--- /dev/null
+++ b/modules/shelving/back/models/sectorCollectionSaleGroup.json
@@ -0,0 +1,30 @@
+{
+ "name": "SectorCollectionSaleGroup",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "sectorCollectionSaleGroup"
+ }
+ },
+ "properties": {
+ "id": {
+ "type": "number",
+ "id": true
+ },
+ "created": {
+ "type": "date"
+ }
+ },
+ "relations": {
+ "sectorCollection": {
+ "type": "belongsTo",
+ "model": "SectorCollection",
+ "foreignKey": "sectorCollectionFk"
+ },
+ "saleGroup": {
+ "type": "belongsTo",
+ "model": "SaleGroup",
+ "foreignKey": "saleGroupFk"
+ }
+ }
+}
diff --git a/modules/supplier/back/methods/supplier/getItemsPackaging.js b/modules/supplier/back/methods/supplier/getItemsPackaging.js
index c06195a55..8a27c89c4 100644
--- a/modules/supplier/back/methods/supplier/getItemsPackaging.js
+++ b/modules/supplier/back/methods/supplier/getItemsPackaging.js
@@ -33,7 +33,7 @@ module.exports = Self => {
JOIN vn.item i ON i.id = b.itemFk
WHERE e.id = ? AND e.supplierFk = ?
GROUP BY i.id
- ) SELECT i.id, i.name, et.quantity, SUM(b.quantity) quantityTotal, et.printedStickers
+ ) SELECT i.id, i.name, et.quantity, SUM(b.quantity) quantityTotal, et.printedStickers, ic.url
FROM vn.buy b
JOIN vn.item i ON i.id = b.itemFk
JOIN vn.entry e ON e.id = b.entryFk
@@ -41,6 +41,7 @@ module.exports = Self => {
JOIN vn.buyConfig bc ON bc.monthsAgo
JOIN vn.travel t ON t.id = e.travelFk
LEFT JOIN entryTmp et ON et.id = i.id
+ JOIN hedera.imageConfig ic
WHERE e.supplierFk = ?
AND i.family IN ('EMB', 'CONT')
AND b.created > (util.VN_CURDATE() - INTERVAL bc.monthsAgo MONTH)
diff --git a/modules/supplier/back/methods/supplier/getSummary.js b/modules/supplier/back/methods/supplier/getSummary.js
index 699233386..67767e7b4 100644
--- a/modules/supplier/back/methods/supplier/getSummary.js
+++ b/modules/supplier/back/methods/supplier/getSummary.js
@@ -55,7 +55,7 @@ module.exports = Self => {
{
relation: 'country',
scope: {
- fields: ['id', 'country', 'code']
+ fields: ['id', 'name', 'code']
}
},
{
diff --git a/modules/supplier/back/methods/supplier/specs/consumption.spec.js b/modules/supplier/back/methods/supplier/specs/consumption.spec.js
index 0b4d6f82c..4c729f64a 100644
--- a/modules/supplier/back/methods/supplier/specs/consumption.spec.js
+++ b/modules/supplier/back/methods/supplier/specs/consumption.spec.js
@@ -1,8 +1,8 @@
const app = require('vn-loopback/server/server');
describe('supplier consumption() filter', () => {
+ const ctx = beforeAll.getCtx();
it('should return a list of entries from the supplier 2', async() => {
- const ctx = {req: {accessToken: {userId: 9}}, args: {}};
const filter = {
where: {
supplierFk: 2
diff --git a/modules/supplier/back/methods/supplier/specs/updateFiscalData.spec.js b/modules/supplier/back/methods/supplier/specs/updateFiscalData.spec.js
index 7cb95f840..f1efbbbba 100644
--- a/modules/supplier/back/methods/supplier/specs/updateFiscalData.spec.js
+++ b/modules/supplier/back/methods/supplier/specs/updateFiscalData.spec.js
@@ -3,7 +3,6 @@ const LoopBackContext = require('loopback-context');
describe('Supplier updateFiscalData()', () => {
const supplierId = 1;
- const administrativeId = 5;
const buyerId = 35;
const name = 'NEW PLANTS';
diff --git a/modules/supplier/back/models/specs/supplier.spec.js b/modules/supplier/back/models/specs/supplier.spec.js
index 05d78240d..4e9bd3253 100644
--- a/modules/supplier/back/models/specs/supplier.spec.js
+++ b/modules/supplier/back/models/specs/supplier.spec.js
@@ -1,25 +1,13 @@
const models = require('vn-loopback/server/server').models;
-const LoopBackContext = require('loopback-context');
describe('loopback model Supplier', () => {
let supplierOne;
let supplierTwo;
+ beforeAll.mockLoopBackContext();
beforeAll(async() => {
supplierOne = await models.Supplier.findById(1);
supplierTwo = await models.Supplier.findById(442);
- const activeCtx = {
- accessToken: {userId: 9},
- http: {
- req: {
- headers: {origin: 'http://localhost'}
- }
- }
- };
-
- spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
- active: activeCtx
- });
});
describe('payMethodFk', () => {
diff --git a/modules/supplier/front/address/create/index.html b/modules/supplier/front/address/create/index.html
index e45539445..e3f883641 100644
--- a/modules/supplier/front/address/create/index.html
+++ b/modules/supplier/front/address/create/index.html
@@ -43,7 +43,7 @@
rule>
{{code}} - {{town.name}} ({{town.province.name}},
- {{town.province.country.country}})
+ {{town.province.country.name}})
{{name}}, {{province.name}}
- ({{province.country.country}})
+ ({{province.country.name}})
- {{name}} ({{country.country}})
+ {{name}} ({{country.name}})
diff --git a/modules/supplier/front/address/edit/index.html b/modules/supplier/front/address/edit/index.html
index b6f90134b..b966023da 100644
--- a/modules/supplier/front/address/edit/index.html
+++ b/modules/supplier/front/address/edit/index.html
@@ -41,7 +41,7 @@
rule>
{{code}} - {{town.name}} ({{town.province.name}},
- {{town.province.country.country}})
+ {{town.province.country.name}})
{{name}}, {{province.name}}
- ({{province.country.country}})
+ ({{province.country.name}})
- {{name}} ({{country.country}})
+ {{name}} ({{country.name}})
diff --git a/modules/supplier/front/fiscal-data/index.html b/modules/supplier/front/fiscal-data/index.html
index 3fe67762f..6455bf3fd 100644
--- a/modules/supplier/front/fiscal-data/index.html
+++ b/modules/supplier/front/fiscal-data/index.html
@@ -16,7 +16,7 @@
auto-load="true"
url="Countries"
data="countries"
- order="country">
+ order="name">
{{code}} - {{town.name}} ({{town.province.name}},
- {{town.province.country.country}})
+ {{town.province.country.name}})
{{name}}, {{province.name}}
- ({{province.country.country}})
+ ({{province.country.name}})
- {{name}} ({{country.country}})
+ {{name}} ({{country.name}})
@@ -198,7 +198,7 @@
vn-name="country"
ng-model="$ctrl.supplier.countryFk"
data="countries"
- show-field="country"
+ show-field="name"
value-field="id"
rule>
diff --git a/modules/supplier/front/search-panel/index.html b/modules/supplier/front/search-panel/index.html
index 161c8a98c..e67fa9083 100644
--- a/modules/supplier/front/search-panel/index.html
+++ b/modules/supplier/front/search-panel/index.html
@@ -35,7 +35,7 @@
label="Country"
ng-model="filter.countryFk"
url="countries"
- show-field="country"
+ show-field="name"
value-field="id">
diff --git a/modules/supplier/front/summary/index.html b/modules/supplier/front/summary/index.html
index d1b3ee20a..5ba713fcf 100644
--- a/modules/supplier/front/summary/index.html
+++ b/modules/supplier/front/summary/index.html
@@ -162,7 +162,7 @@
+ value="{{::$ctrl.summary.country.name}}">
diff --git a/modules/ticket/back/methods/expedition-state/addExpeditionState.js b/modules/ticket/back/methods/expedition-state/addExpeditionState.js
index 8eab1a838..80d74ee92 100644
--- a/modules/ticket/back/methods/expedition-state/addExpeditionState.js
+++ b/modules/ticket/back/methods/expedition-state/addExpeditionState.js
@@ -44,11 +44,13 @@ module.exports = Self => {
const typeFk = expeditionStateType.id;
expeditionId = expedition.expeditionFk;
+ const isScannedExpedition = expedition.isScanned ?? false;
await models.ExpeditionState.create({
expeditionFk: expedition.expeditionFk,
typeFk,
userFk: userId,
+ isScanned: isScannedExpedition,
}, myOptions);
}
diff --git a/modules/ticket/back/methods/expedition-state/specs/addExpeditionState.spec.js b/modules/ticket/back/methods/expedition-state/specs/addExpeditionState.spec.js
index 6c7739006..747352286 100644
--- a/modules/ticket/back/methods/expedition-state/specs/addExpeditionState.spec.js
+++ b/modules/ticket/back/methods/expedition-state/specs/addExpeditionState.spec.js
@@ -1,7 +1,7 @@
const models = require('vn-loopback/server/server').models;
describe('expeditionState addExpeditionState()', () => {
- const ctx = {req: {accessToken: {userId: 9}}};
+ const ctx = beforeAll.getCtx();
it('should update the expedition states', async() => {
const tx = await models.ExpeditionState.beginTransaction({});
try {
diff --git a/modules/ticket/back/methods/expedition/specs/deleteExpeditions.spec.js b/modules/ticket/back/methods/expedition/specs/deleteExpeditions.spec.js
index bf8bafe34..4b17f98b7 100644
--- a/modules/ticket/back/methods/expedition/specs/deleteExpeditions.spec.js
+++ b/modules/ticket/back/methods/expedition/specs/deleteExpeditions.spec.js
@@ -1,19 +1,7 @@
const models = require('vn-loopback/server/server').models;
-const LoopBackContext = require('loopback-context');
describe('ticket deleteExpeditions()', () => {
- let ctx;
- beforeAll(async() => {
- ctx = {
- accessToken: {userId: 9},
- req: {
- headers: {origin: 'http://localhost'}
- }
- };
- spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
- active: ctx
- });
- });
+ const ctx = beforeAll.getCtx();
it('should delete the selected expeditions', async() => {
const tx = await models.Expedition.beginTransaction({});
diff --git a/modules/ticket/back/methods/expedition/specs/moveExpeditions.spec.js b/modules/ticket/back/methods/expedition/specs/moveExpeditions.spec.js
index 5f211543e..c1c7c2c12 100644
--- a/modules/ticket/back/methods/expedition/specs/moveExpeditions.spec.js
+++ b/modules/ticket/back/methods/expedition/specs/moveExpeditions.spec.js
@@ -1,29 +1,11 @@
const models = require('vn-loopback/server/server').models;
-const LoopBackContext = require('loopback-context');
describe('ticket moveExpeditions()', () => {
- beforeAll(async() => {
- const activeCtx = {
- accessToken: {userId: 9},
- http: {
- req: {
- headers: {origin: 'http://localhost'}
- }
- }
- };
- spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
- active: activeCtx
- });
- });
+ const ctx = beforeAll.getCtx();
it('should move the selected expeditions to new ticket', async() => {
const tx = await models.Expedition.beginTransaction({});
- const ctx = {
- req: {accessToken: {userId: 9}},
- args: {},
- params: {}
- };
- const myCtx = Object.assign({}, ctx);
+ const myCtx = ctx;
try {
const options = {transaction: tx};
@@ -38,7 +20,7 @@ describe('ticket moveExpeditions()', () => {
};
- const ticket = await models.Expedition.moveExpeditions(myCtx, options);
+ const ticket = await models.Expedition.moveExpeditions(ctx, options);
const newestTicketIdInFixtures = 27;
diff --git a/modules/ticket/back/methods/sale/clone.js b/modules/ticket/back/methods/sale/clone.js
index 77c40d8a0..9185a6e75 100644
--- a/modules/ticket/back/methods/sale/clone.js
+++ b/modules/ticket/back/methods/sale/clone.js
@@ -135,6 +135,7 @@ module.exports = Self => {
const now = Date.vnNew();
const ticket = await models.Ticket.findById(ticketId, null, myOptions);
+ if (!ctx.args) ctx.args = {};
ctx.args.clientId = ticket.clientFk;
ctx.args.shipped = now;
ctx.args.landed = now;
@@ -144,15 +145,10 @@ module.exports = Self => {
const newTicket = await models.Ticket.new(ctx, myOptions);
- const ticketRefund = await models.TicketRefund.findOne({
- where: {refundTicketFk: ticketId}
+ await models.TicketRefund.create({
+ originalTicketFk: ticketId,
+ refundTicketFk: newTicket.id
}, myOptions);
- if (negative && (withWarehouse || !ticketRefund?.id)) {
- await models.TicketRefund.create({
- originalTicketFk: ticketId,
- refundTicketFk: newTicket.id
- }, myOptions);
- }
return newTicket;
}
diff --git a/modules/ticket/back/methods/sale/deleteSales.js b/modules/ticket/back/methods/sale/deleteSales.js
index 0207815a9..0290b2b9d 100644
--- a/modules/ticket/back/methods/sale/deleteSales.js
+++ b/modules/ticket/back/methods/sale/deleteSales.js
@@ -66,6 +66,10 @@ module.exports = Self => {
promises.push(deletedSale);
}
+ const deletedSales = await Promise.all(promises);
+
+ if (tx) await tx.commit();
+
const salesPerson = ticket.client().salesPersonUser();
if (salesPerson) {
const url = await Self.app.models.Url.getUrl();
@@ -75,13 +79,9 @@ module.exports = Self => {
ticketUrl: `${url}ticket/${ticketId}/sale`,
deletions: deletions
});
- await models.Chat.sendCheckingPresence(ctx, salesPerson.id, message, myOptions);
+ await models.Chat.sendCheckingPresence(ctx, salesPerson.id, message);
}
- const deletedSales = await Promise.all(promises);
-
- if (tx) await tx.commit();
-
return deletedSales;
} catch (e) {
if (tx) await tx.rollback();
diff --git a/modules/ticket/back/methods/sale/specs/canEdit.spec.js b/modules/ticket/back/methods/sale/specs/canEdit.spec.js
index 200ea24cc..168bd28fb 100644
--- a/modules/ticket/back/methods/sale/specs/canEdit.spec.js
+++ b/modules/ticket/back/methods/sale/specs/canEdit.spec.js
@@ -1,21 +1,8 @@
const models = require('vn-loopback/server/server').models;
-const LoopBackContext = require('loopback-context');
describe('sale canEdit()', () => {
const employeeId = 1;
- beforeAll(async() => {
- const activeCtx = {
- accessToken: {userId: 9},
- http: {
- req: {
- headers: {origin: 'http://localhost'}
- }
- }
- };
- spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
- active: activeCtx
- });
- });
+ beforeAll.mockLoopBackContext();
describe('sale not exists', () => {
it('should return error if sale not exists', async() => {
diff --git a/modules/ticket/back/methods/sale/specs/clone.spec.js b/modules/ticket/back/methods/sale/specs/clone.spec.js
index e2220c028..5b0dc84a7 100644
--- a/modules/ticket/back/methods/sale/specs/clone.spec.js
+++ b/modules/ticket/back/methods/sale/specs/clone.spec.js
@@ -1,24 +1,11 @@
const models = require('vn-loopback/server/server').models;
-const LoopBackContext = require('loopback-context');
-
describe('Ticket cloning - clone function', () => {
- let ctx;
+ const ctx = beforeAll.getCtx();
+ beforeAll.mockLoopBackContext();
let options;
let tx;
beforeEach(async() => {
- ctx = {
- req: {
- accessToken: {userId: 9},
- headers: {origin: 'http://localhost'}
- },
- args: {}
- };
-
- spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
- active: ctx.req
- });
-
options = {transaction: tx};
tx = await models.Sale.beginTransaction({});
options.transaction = tx;
diff --git a/modules/ticket/back/methods/sale/specs/deleteSales.spec.js b/modules/ticket/back/methods/sale/specs/deleteSales.spec.js
index 3d3e06e22..ba14310a1 100644
--- a/modules/ticket/back/methods/sale/specs/deleteSales.spec.js
+++ b/modules/ticket/back/methods/sale/specs/deleteSales.spec.js
@@ -1,20 +1,8 @@
const models = require('vn-loopback/server/server').models;
-const LoopBackContext = require('loopback-context');
describe('sale deleteSales()', () => {
- beforeAll(async() => {
- const activeCtx = {
- accessToken: {userId: 9},
- http: {
- req: {
- headers: {origin: 'http://localhost'}
- }
- }
- };
- spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
- active: activeCtx
- });
- });
+ const ctx = beforeAll.getCtx();
+ beforeAll.mockLoopBackContext();
it('should throw an error if the ticket of the given sales is not editable', async() => {
const tx = await models.Sale.beginTransaction({});
@@ -23,14 +11,6 @@ describe('sale deleteSales()', () => {
try {
const options = {transaction: tx};
- const ctx = {
- req: {
- accessToken: {userId: 9},
- headers: {origin: 'localhost:5000'},
- __: () => {}
- }
- };
-
const sales = [{id: 1, instance: 0}, {id: 2, instance: 1}];
const ticketId = 2;
@@ -51,13 +31,6 @@ describe('sale deleteSales()', () => {
try {
const options = {transaction: tx};
- const ctx = {
- req: {
- accessToken: {userId: 9},
- headers: {origin: 'localhost:5000'},
- __: () => {}
- }
- };
const sale = await models.Sale.findOne({where: {id: 9}}, options);
sale.id = null;
const newSale = await models.Sale.create(sale, options);
diff --git a/modules/ticket/back/methods/sale/specs/recalculatePrice.spec.js b/modules/ticket/back/methods/sale/specs/recalculatePrice.spec.js
index 0fc68dee7..b97060a3d 100644
--- a/modules/ticket/back/methods/sale/specs/recalculatePrice.spec.js
+++ b/modules/ticket/back/methods/sale/specs/recalculatePrice.spec.js
@@ -1,6 +1,7 @@
const models = require('vn-loopback/server/server').models;
describe('sale recalculatePrice()', () => {
+ const ctx = beforeAll.getCtx();
it('should update the sale price', async() => {
const tx = await models.Sale.beginTransaction({});
const sales = [
@@ -10,7 +11,6 @@ describe('sale recalculatePrice()', () => {
try {
const options = {transaction: tx};
- const ctx = {req: {accessToken: {userId: 9}}};
const response = await models.Sale.recalculatePrice(ctx, sales, options);
expect(response[0].affectedRows).toBeDefined();
@@ -30,7 +30,6 @@ describe('sale recalculatePrice()', () => {
try {
const options = {transaction: tx};
- const ctx = {req: {accessToken: {userId: 9}}};
const immutableSale = [{id: 1, ticketFk: 1}];
await models.Sale.recalculatePrice(ctx, immutableSale, options);
diff --git a/modules/ticket/back/methods/sale/specs/reserve.spec.js b/modules/ticket/back/methods/sale/specs/reserve.spec.js
index 7ba5999b3..e39f636cc 100644
--- a/modules/ticket/back/methods/sale/specs/reserve.spec.js
+++ b/modules/ticket/back/methods/sale/specs/reserve.spec.js
@@ -1,5 +1,4 @@
const models = require('vn-loopback/server/server').models;
-const LoopBackContext = require('loopback-context');
describe('sale reserve()', () => {
const ctx = {
@@ -10,19 +9,7 @@ describe('sale reserve()', () => {
}
};
- beforeAll(async() => {
- const activeCtx = {
- accessToken: {userId: 9},
- http: {
- req: {
- headers: {origin: 'http://localhost'}
- }
- }
- };
- spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
- active: activeCtx
- });
- });
+ beforeAll.mockLoopBackContext();
it('should throw an error if the ticket can not be modified', async() => {
const tx = await models.Sale.beginTransaction({});
diff --git a/modules/ticket/back/methods/sale/specs/updateConcept.spec.js b/modules/ticket/back/methods/sale/specs/updateConcept.spec.js
index 1b42e7140..8e3538fc3 100644
--- a/modules/ticket/back/methods/sale/specs/updateConcept.spec.js
+++ b/modules/ticket/back/methods/sale/specs/updateConcept.spec.js
@@ -1,22 +1,7 @@
const models = require('vn-loopback/server/server').models;
-const LoopBackContext = require('loopback-context');
describe('sale updateConcept()', () => {
- beforeAll(async() => {
- const activeCtx = {
- accessToken: {userId: 9},
- http: {
- req: {
- headers: {origin: 'http://localhost'}
- }
- }
- };
- spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
- active: activeCtx
- });
- });
-
- const ctx = {req: {accessToken: {userId: 9}}};
+ const ctx = beforeAll.getCtx();
const saleId = 25;
it('should throw if ID was undefined', async() => {
diff --git a/modules/ticket/back/methods/sale/updateQuantity.js b/modules/ticket/back/methods/sale/updateQuantity.js
index 610826283..36d75ffed 100644
--- a/modules/ticket/back/methods/sale/updateQuantity.js
+++ b/modules/ticket/back/methods/sale/updateQuantity.js
@@ -72,16 +72,20 @@ module.exports = Self => {
const salesPerson = sale.ticket().client().salesPersonUser();
if (salesPerson) {
const url = await Self.app.models.Url.getUrl();
- const message = $t('Changed sale quantity', {
- ticketId: sale.ticket().id,
+ const change = $t('Changes in sales', {
itemId: sale.itemFk,
concept: sale.concept,
oldQuantity: oldQuantity,
newQuantity: newQuantity,
- ticketUrl: `${url}ticket/${sale.ticket().id}/sale`,
itemUrl: `${url}item/${sale.itemFk}/summary`
});
+ const message = $t('Changed sale quantity', {
+ ticketId: sale.ticket().id,
+ changes: change,
+ ticketUrl: `${url}ticket/${sale.ticket().id}/sale`,
+ });
+
await models.Chat.sendCheckingPresence(ctx, salesPerson.id, message, myOptions);
}
diff --git a/modules/ticket/back/methods/ticket-request/specs/confirm.spec.js b/modules/ticket/back/methods/ticket-request/specs/confirm.spec.js
index 668a991f4..3fe174e46 100644
--- a/modules/ticket/back/methods/ticket-request/specs/confirm.spec.js
+++ b/modules/ticket/back/methods/ticket-request/specs/confirm.spec.js
@@ -1,29 +1,8 @@
const models = require('vn-loopback/server/server').models;
-const LoopBackContext = require('loopback-context');
describe('ticket-request confirm()', () => {
- beforeAll(async() => {
- const activeCtx = {
- accessToken: {userId: 9},
- http: {
- req: {
- headers: {origin: 'http://localhost'}
- }
- }
- };
- spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
- active: activeCtx
- });
- });
- let ctx = {
- req: {
- accessToken: {userId: 9},
- headers: {origin: 'http://localhost'}
- }
- };
- ctx.req.__ = value => {
- return value;
- };
+ const ctx = beforeAll.getCtx();
+ beforeAll.mockLoopBackContext();
it(`should throw an error if the item doesn't exist`, async() => {
const tx = await models.TicketRequest.beginTransaction({});
diff --git a/modules/ticket/back/methods/ticket-request/specs/deny.spec.js b/modules/ticket/back/methods/ticket-request/specs/deny.spec.js
index 875a75921..9920bd4d3 100644
--- a/modules/ticket/back/methods/ticket-request/specs/deny.spec.js
+++ b/modules/ticket/back/methods/ticket-request/specs/deny.spec.js
@@ -1,39 +1,15 @@
const models = require('vn-loopback/server/server').models;
-const LoopBackContext = require('loopback-context');
describe('ticket-request deny()', () => {
- beforeAll(async() => {
- const activeCtx = {
- accessToken: {userId: 9},
- http: {
- req: {
- headers: {origin: 'http://localhost'}
- }
- }
- };
- spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
- active: activeCtx
- });
- });
+ const ctx = beforeAll.getCtx();
+ beforeAll.mockLoopBackContext();
it('should return the denied ticket request', async() => {
const tx = await models.TicketRequest.beginTransaction({});
try {
const options = {transaction: tx};
-
- const ctx = {
- req: {
- accessToken: {userId: 9},
- headers: {origin: 'http://localhost'}
- },
- args: {id: 4, observation: 'my observation'},
- };
-
- ctx.req.__ = value => {
- return value;
- };
-
+ ctx.args = {id: 4, observation: 'my observation'};
const result = await models.TicketRequest.deny(ctx, options);
expect(result.id).toEqual(4);
diff --git a/modules/ticket/back/methods/ticket-tracking/specs/setDelivered.spec.js b/modules/ticket/back/methods/ticket-tracking/specs/setDelivered.spec.js
index 3d37221c4..3d39ea278 100644
--- a/modules/ticket/back/methods/ticket-tracking/specs/setDelivered.spec.js
+++ b/modules/ticket/back/methods/ticket-tracking/specs/setDelivered.spec.js
@@ -2,10 +2,12 @@ const models = require('vn-loopback/server/server').models;
const LoopBackContext = require('loopback-context');
describe('ticket setDelivered()', () => {
- const userId = 50;
+ const userId = 49;
const activeCtx = {
accessToken: {userId: userId},
+ __: value => value
};
+ const ctx = {req: activeCtx};
beforeAll(async() => {
spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
@@ -19,8 +21,6 @@ describe('ticket setDelivered()', () => {
try {
const options = {transaction: tx};
- const ctx = {req: {accessToken: {userId: 49}}};
-
const originalTicketOne = await models.Ticket.findById(8, null, options);
const originalTicketTwo = await models.Ticket.findById(10, null, options);
diff --git a/modules/ticket/back/methods/ticket/addSale.js b/modules/ticket/back/methods/ticket/addSale.js
index 826de6e12..8dc7a633c 100644
--- a/modules/ticket/back/methods/ticket/addSale.js
+++ b/modules/ticket/back/methods/ticket/addSale.js
@@ -10,8 +10,8 @@ module.exports = Self => {
http: {source: 'path'}
},
{
- arg: 'itemId',
- type: 'number',
+ arg: 'barcode',
+ type: 'any',
required: true
},
{
@@ -29,7 +29,7 @@ module.exports = Self => {
}
});
- Self.addSale = async(ctx, id, itemId, quantity, options) => {
+ Self.addSale = async(ctx, id, barcode, quantity, options) => {
const $t = ctx.req.__; // $translate
const models = Self.app.models;
const myOptions = {userId: ctx.req.accessToken.userId};
@@ -46,7 +46,9 @@ module.exports = Self => {
try {
await models.Ticket.isEditableOrThrow(ctx, id, myOptions);
+ const itemId = await models.ItemBarcode.toItem(barcode, myOptions);
const item = await models.Item.findById(itemId, null, myOptions);
+
const ticket = await models.Ticket.findById(id, {
include: {
relation: 'client',
diff --git a/modules/ticket/back/methods/ticket/addSaleByCode.js b/modules/ticket/back/methods/ticket/addSaleByCode.js
deleted file mode 100644
index ca3d2cb07..000000000
--- a/modules/ticket/back/methods/ticket/addSaleByCode.js
+++ /dev/null
@@ -1,56 +0,0 @@
-const UserError = require('vn-loopback/util/user-error');
-module.exports = Self => {
- Self.remoteMethodCtx('addSaleByCode', {
- description: 'Add a collection',
- accessType: 'WRITE',
- accepts: [
- {
- arg: 'barcode',
- type: 'string',
- required: true
- }, {
- arg: 'quantity',
- type: 'number',
- required: true
- }, {
- arg: 'ticketFk',
- type: 'number',
- required: true
- }, {
- arg: 'warehouseFk',
- type: 'number',
- required: true
- },
-
- ],
- http: {
- path: `/addSaleByCode`,
- verb: 'POST'
- },
- });
-
- Self.addSaleByCode = async(ctx, barcode, quantity, ticketFk, warehouseFk, options) => {
- const myOptions = {userId: ctx.req.accessToken.userId};
- let tx;
-
- if (typeof options == 'object')
- Object.assign(myOptions, options);
-
- if (!myOptions.transaction) {
- tx = await Self.beginTransaction({});
- myOptions.transaction = tx;
- }
-
- try {
- const [[item]] = await Self.rawSql('CALL vn.item_getInfo(?,?)', [barcode, warehouseFk], myOptions);
- if (!item?.available) throw new UserError('We do not have availability for the selected item');
-
- await Self.rawSql('CALL vn.collection_addItem(?, ?, ?)', [item.id, quantity, ticketFk], myOptions);
-
- if (tx) await tx.commit();
- } catch (e) {
- if (tx) await tx.rollback();
- throw e;
- }
- };
-};
diff --git a/modules/ticket/back/methods/ticket/closeAll.js b/modules/ticket/back/methods/ticket/closeAll.js
index d35bd1e3e..35b9b1e37 100644
--- a/modules/ticket/back/methods/ticket/closeAll.js
+++ b/modules/ticket/back/methods/ticket/closeAll.js
@@ -138,12 +138,13 @@ module.exports = Self => {
JOIN alertLevel al ON al.id = ts.alertLevel
JOIN agencyMode am ON am.id = t.agencyModeFk
JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk
- JOIN zone z ON z.id = t.zoneFk
+ LEFT JOIN ticketObservation tob ON tob.ticketFk = t.id
SET t.routeFk = NULL
WHERE DATE(t.shipped) BETWEEN ? - INTERVAL 2 DAY AND util.dayEnd(?)
- AND al.code NOT IN('DELIVERED','PACKED')
- AND t.routeFk
- AND z.name LIKE '%MADRID%'`, [toDate, toDate], {userId: ctx.req.accessToken.userId});
+ AND al.code NOT IN ('DELIVERED', 'PACKED')
+ AND NOT t.packages
+ AND tob.id IS NULL
+ AND t.routeFk`, [toDate, toDate], {userId: ctx.req.accessToken.userId});
return {
message: 'Success'
diff --git a/modules/ticket/back/methods/ticket/closure.js b/modules/ticket/back/methods/ticket/closure.js
index 8c59dc3b0..fba39f18f 100644
--- a/modules/ticket/back/methods/ticket/closure.js
+++ b/modules/ticket/back/methods/ticket/closure.js
@@ -13,8 +13,6 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
const failedtickets = [];
for (const ticket of tickets) {
try {
- await Self.rawSql(`CALL util.debugAdd('invoicingTicket', ?)`, [ticket.id], {userId});
-
await Self.app.models.InvoiceOut.getSerial(ticket.clientFk, ticket.companyFk, ticket.addressFk, 'M');
await Self.rawSql(
`CALL vn.ticket_closeByTicket(?)`,
diff --git a/modules/ticket/back/methods/ticket/docuwareDownload.js b/modules/ticket/back/methods/ticket/docuwareDownload.js
index 7084bbdd4..f89509570 100644
--- a/modules/ticket/back/methods/ticket/docuwareDownload.js
+++ b/modules/ticket/back/methods/ticket/docuwareDownload.js
@@ -28,7 +28,8 @@ module.exports = Self => {
http: {
path: `/:id/docuwareDownload`,
verb: 'GET'
- }
+ },
+ accessScopes: ['DEFAULT', 'read:multimedia']
});
Self.docuwareDownload = async id => {
diff --git a/modules/ticket/back/methods/ticket/isEditableOrThrow.js b/modules/ticket/back/methods/ticket/isEditableOrThrow.js
index 16cff84f1..555063093 100644
--- a/modules/ticket/back/methods/ticket/isEditableOrThrow.js
+++ b/modules/ticket/back/methods/ticket/isEditableOrThrow.js
@@ -8,18 +8,13 @@ module.exports = Self => {
if (typeof options == 'object')
Object.assign(myOptions, options);
- const state = await models.TicketState.findOne({
- where: {ticketFk: id}
- }, myOptions);
-
+ const state = await models.TicketState.findOne({where: {ticketFk: id}}, myOptions);
const isRoleAdvanced = await models.ACL.checkAccessAcl(ctx, 'Ticket', 'isRoleAdvanced', '*');
+ const isProductionReviewer = await models.ACL.checkAccessAcl(ctx, 'Sale', 'isInPreparing', '*');
const canEditWeeklyTicket = await models.ACL.checkAccessAcl(ctx, 'Ticket', 'canEditWeekly', 'WRITE');
const alertLevel = state ? state.alertLevel : null;
const ticket = await models.Ticket.findById(id, {
- fields: ['clientFk'],
- include: {
- relation: 'client'
- }
+ fields: ['clientFk'], include: {relation: 'client'}
}, myOptions);
const isLocked = await models.Ticket.isLocked(id, myOptions);
@@ -29,10 +24,24 @@ module.exports = Self => {
const isNormalClient = ticket && ticket.client().typeFk == 'normal';
const isEditable = !(alertLevelGreaterThanZero && isNormalClient);
+ const ticketCollection = await models.TicketCollection.findOne({
+ include: {relation: 'collection'}, where: {ticketFk: id}
+ }, myOptions);
+ let isOwner = ticketCollection?.collection()?.workerFk === ctx.req.accessToken.userId;
+
+ if (!isOwner) {
+ const saleGroup = await models.SaleGroup.findOne({fields: ['id'], where: {ticketFk: id}}, myOptions);
+ const sectorCollectionSaleGroup = saleGroup && await models.SectorCollectionSaleGroup.findOne({
+ include: {relation: 'sectorCollection'}, where: {saleGroupFk: saleGroup.id}
+ }, myOptions);
+
+ isOwner = sectorCollectionSaleGroup?.sectorCollection()?.userFk === ctx.req.accessToken.userId;
+ }
+
if (!ticket)
throw new ForbiddenError(`The ticket doesn't exist.`);
- if (!isEditable && !isRoleAdvanced)
+ if (!isEditable && !isRoleAdvanced && !isProductionReviewer && !isOwner)
throw new ForbiddenError(`This ticket is not editable.`);
if (isLocked && !isWeekly)
diff --git a/modules/ticket/back/methods/ticket/saveSign.js b/modules/ticket/back/methods/ticket/saveSign.js
index 490b05320..ed54a5074 100644
--- a/modules/ticket/back/methods/ticket/saveSign.js
+++ b/modules/ticket/back/methods/ticket/saveSign.js
@@ -140,14 +140,7 @@ module.exports = Self => {
await models.TicketDms.create({ticketFk: ticket.id, dmsFk: dms[0].id}, myOptions);
await ticket.updateAttribute('isSigned', true, myOptions);
- const deliveryState = await models.State.findOne({
- where: {code: 'DELIVERED'}
- }, myOptions);
-
- await models.Ticket.state(ctx, {
- ticketFk: ticketId,
- stateFk: deliveryState.id
- }, myOptions);
+ await Self.rawSql(`CALL vn.ticket_setState(?, ?)`, [ticketId, 'DELIVERED'], myOptions);
if (ticket?.address()?.province()?.country()?.code != 'ES' && ticket.cmrFk) {
await models.Ticket.saveCmr(ctx, [ticketId], myOptions);
diff --git a/modules/ticket/back/methods/ticket/setDeleted.js b/modules/ticket/back/methods/ticket/setDeleted.js
index 9a9fd9056..2afdf44ac 100644
--- a/modules/ticket/back/methods/ticket/setDeleted.js
+++ b/modules/ticket/back/methods/ticket/setDeleted.js
@@ -71,7 +71,10 @@ module.exports = Self => {
// Check for existing purchase requests
const hasPurchaseRequests = await models.TicketRequest.count({
ticketFk: id,
- isOk: true
+ or: [
+ {isOk: true},
+ {isOk: null}
+ ]
}, myOptions);
if (hasPurchaseRequests)
diff --git a/modules/ticket/back/methods/ticket/specs/addSaleByCode.spec.js b/modules/ticket/back/methods/ticket/specs/addSaleByCode.spec.js
deleted file mode 100644
index b97139178..000000000
--- a/modules/ticket/back/methods/ticket/specs/addSaleByCode.spec.js
+++ /dev/null
@@ -1,39 +0,0 @@
-const {models} = require('vn-loopback/server/server');
-const LoopBackContext = require('loopback-context');
-
-describe('Ticket addSaleByCode()', () => {
- const quantity = 3;
- const ticketFk = 13;
- const warehouseFk = 1;
- beforeAll(async() => {
- activeCtx = {
- req: {
- accessToken: {userId: 9},
- headers: {origin: 'http://localhost'},
- __: value => value
- }
- };
- spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
- active: activeCtx
- });
- });
-
- it('should add a new sale', async() => {
- const tx = await models.Ticket.beginTransaction({});
-
- try {
- const options = {transaction: tx};
- const code = '1111111111';
-
- const salesBefore = await models.Sale.find(null, options);
- await models.Ticket.addSaleByCode(activeCtx, code, quantity, ticketFk, warehouseFk, options);
- const salesAfter = await models.Sale.find(null, options);
-
- expect(salesAfter.length).toEqual(salesBefore.length + 1);
- await tx.rollback();
- } catch (e) {
- await tx.rollback();
- throw e;
- }
- });
-});
diff --git a/modules/ticket/back/methods/ticket/specs/clone.spec.js b/modules/ticket/back/methods/ticket/specs/clone.spec.js
index 26114bd58..ccc0dcdf3 100644
--- a/modules/ticket/back/methods/ticket/specs/clone.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/clone.spec.js
@@ -1,26 +1,13 @@
const models = require('vn-loopback/server/server').models;
-const LoopBackContext = require('loopback-context');
describe('Ticket cloning - clone function', () => {
- let ctx;
+ const ctx = beforeAll.getCtx();
let options;
let tx;
const ticketId = 1;
const shipped = Date.vnNew();
beforeEach(async() => {
- ctx = {
- req: {
- accessToken: {userId: 9},
- headers: {origin: 'http://localhost'}
- },
- args: {}
- };
-
- spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
- active: ctx.req
- });
-
options = {transaction: tx};
tx = await models.Ticket.beginTransaction({});
options.transaction = tx;
diff --git a/modules/ticket/back/methods/ticket/specs/componentUpdate.spec.js b/modules/ticket/back/methods/ticket/specs/componentUpdate.spec.js
index 8abb1a4a1..15dd5e4ce 100644
--- a/modules/ticket/back/methods/ticket/specs/componentUpdate.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/componentUpdate.spec.js
@@ -1,8 +1,7 @@
const models = require('vn-loopback/server/server').models;
-const LoopBackContext = require('loopback-context');
describe('ticket componentUpdate()', () => {
- const userID = 1101;
+ const ctx = beforeAll.getCtx(1101);
const ticketID = 11;
const today = Date.vnNew();
const tomorrow = Date.vnNew();
@@ -16,18 +15,8 @@ describe('ticket componentUpdate()', () => {
let componentOfSaleEight;
let componentValue;
+ beforeAll.mockLoopBackContext();
beforeAll(async() => {
- const activeCtx = {
- accessToken: {userId: 9},
- http: {
- req: {
- headers: {origin: 'http://localhost'}
- }
- }
- };
- spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
- active: activeCtx
- });
const deliveryComponenet = await models.Component.findOne({where: {code: 'delivery'}});
deliveryComponentId = deliveryComponenet.id;
componentOfSaleSeven = `SELECT value
@@ -64,16 +53,7 @@ describe('ticket componentUpdate()', () => {
isWithoutNegatives: false
};
- let ctx = {
- args: args,
- req: {
- accessToken: {userId: userID},
- headers: {origin: 'http://localhost'},
- __: value => {
- return value;
- }
- }
- };
+ ctx.args = args;
await models.Ticket.componentUpdate(ctx, options);
[componentValue] = await models.SaleComponent.rawSql(componentOfSaleSeven, null, options);
@@ -113,16 +93,7 @@ describe('ticket componentUpdate()', () => {
isWithoutNegatives: false
};
- const ctx = {
- args: args,
- req: {
- accessToken: {userId: userID},
- headers: {origin: 'http://localhost'},
- __: value => {
- return value;
- }
- }
- };
+ ctx.args = args;
const observationTypeDelivery = await models.ObservationType.findOne({
where: {code: 'delivery'}
}, options);
@@ -152,6 +123,7 @@ describe('ticket componentUpdate()', () => {
});
it('should change warehouse and without negatives', async() => {
+ const ctx = beforeAll.getCtx(9);
const tx = await models.SaleComponent.beginTransaction({});
try {
@@ -178,17 +150,7 @@ describe('ticket componentUpdate()', () => {
option: 'renewPrices',
isWithoutNegatives: true
};
-
- const ctx = {
- args: args,
- req: {
- accessToken: {userId: 9},
- headers: {origin: 'http://localhost'},
- __: value => {
- return value;
- }
- }
- };
+ ctx.args = args;
const oldTicket = await models.Ticket.findById(ticketID, null, options);
@@ -210,6 +172,7 @@ describe('ticket componentUpdate()', () => {
});
describe('componentUpdate() keepPrice', () => {
+ const ctx = beforeAll.getCtx();
it('should change shipped and keep price', async() => {
const tx = await models.Ticket.beginTransaction({});
@@ -239,16 +202,7 @@ describe('ticket componentUpdate()', () => {
keepPrice: true
};
- const ctx = {
- args: args,
- req: {
- accessToken: {userId: 9},
- headers: {origin: 'http://localhost'},
- __: value => {
- return value;
- }
- }
- };
+ ctx.args = args;
const beforeSale = await models.Sale.findById(saleId, null, options);
await models.Ticket.componentUpdate(ctx, options);
@@ -292,16 +246,7 @@ describe('ticket componentUpdate()', () => {
keepPrice: false
};
- const ctx = {
- args: args,
- req: {
- accessToken: {userId: 9},
- headers: {origin: 'http://localhost'},
- __: value => {
- return value;
- }
- }
- };
+ ctx.args = args;
const beforeSale = await models.Sale.findById(saleId, null, options);
await models.Ticket.componentUpdate(ctx, options);
diff --git a/modules/ticket/back/methods/ticket/specs/filter.spec.js b/modules/ticket/back/methods/ticket/specs/filter.spec.js
index e495a41f5..1d050931b 100644
--- a/modules/ticket/back/methods/ticket/specs/filter.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/filter.spec.js
@@ -1,6 +1,7 @@
const models = require('vn-loopback/server/server').models;
describe('ticket filter()', () => {
+ const ctx = beforeAll.getCtx();
it('should return the tickets matching the filter', async() => {
const tx = await models.Ticket.beginTransaction({});
@@ -31,11 +32,12 @@ describe('ticket filter()', () => {
const today = Date.vnNew();
today.setHours(23, 59, 59, 59);
- const ctx = {req: {accessToken: {userId: 9}}, args: {
+ const args = {
problems: true,
from: yesterday,
to: today
- }};
+ };
+ ctx.args = args;
const filter = {};
const result = await models.Ticket.filter(ctx, filter, options);
@@ -60,15 +62,16 @@ describe('ticket filter()', () => {
const today = Date.vnNew();
today.setHours(23, 59, 59, 59);
- const ctx = {req: {accessToken: {userId: 9}}, args: {
+ const args = {
problems: false,
from: yesterday,
to: today
- }};
+ };
+ ctx.args = args;
const filter = {};
const result = await models.Ticket.filter(ctx, filter, options);
- expect(result.length).toEqual(7);
+ expect(result.length).toEqual(10);
await tx.rollback();
} catch (e) {
@@ -83,7 +86,8 @@ describe('ticket filter()', () => {
try {
const options = {transaction: tx};
- const ctx = {req: {accessToken: {userId: 9}}, args: {problems: null}};
+ const args = {problems: null};
+ ctx.args = args;
const filter = {};
const result = await models.Ticket.filter(ctx, filter, options);
@@ -102,7 +106,8 @@ describe('ticket filter()', () => {
try {
const options = {transaction: tx};
- const ctx = {req: {accessToken: {userId: 9}}, args: {orderFk: 11}};
+ const args = {orderFk: 11};
+ ctx.args = args;
const filter = {};
const result = await models.Ticket.filter(ctx, filter, options);
const firstRow = result[0];
@@ -123,7 +128,8 @@ describe('ticket filter()', () => {
try {
const options = {transaction: tx};
- const ctx = {req: {accessToken: {userId: 9}}, args: {pending: true}};
+ const args = {pending: true};
+ ctx.args = args;
const filter = {};
const result = await models.Ticket.filter(ctx, filter, options);
@@ -146,7 +152,8 @@ describe('ticket filter()', () => {
try {
const options = {transaction: tx};
- const ctx = {req: {accessToken: {userId: 9}}, args: {pending: false}};
+ const args = {pending: false};
+ ctx.args = args;
const filter = {};
const result = await models.Ticket.filter(ctx, filter, options);
const firstRow = result[0];
@@ -167,11 +174,13 @@ describe('ticket filter()', () => {
it('should return the tickets from the worker team', async() => {
const tx = await models.Ticket.beginTransaction({});
+ const ctx = beforeAll.getCtx(18);
try {
const options = {transaction: tx};
- const ctx = {req: {accessToken: {userId: 18}}, args: {myTeam: true}};
+ const args = {myTeam: true};
+ ctx.args = args;
const filter = {};
const result = await models.Ticket.filter(ctx, filter, options);
@@ -185,12 +194,14 @@ describe('ticket filter()', () => {
});
it('should return the tickets that are not from the worker team', async() => {
+ const ctx = beforeAll.getCtx(18);
const tx = await models.Ticket.beginTransaction({});
try {
const options = {transaction: tx};
- const ctx = {req: {accessToken: {userId: 18}}, args: {myTeam: false}};
+ const args = {myTeam: false};
+ ctx.args = args;
const filter = {};
const result = await models.Ticket.filter(ctx, filter, options);
@@ -204,12 +215,14 @@ describe('ticket filter()', () => {
});
it('should return the tickets belonging to the collection id 1', async() => {
+ const ctx = beforeAll.getCtx(18);
const tx = await models.Ticket.beginTransaction({});
try {
const options = {transaction: tx};
- const ctx = {req: {accessToken: {userId: 18}}, args: {collectionFk: 1}};
+ const args = {collectionFk: 1};
+ ctx.args = args;
const filter = {};
const result = await models.Ticket.filter(ctx, filter, options);
@@ -228,7 +241,8 @@ describe('ticket filter()', () => {
try {
const options = {transaction: tx};
- const ctx = {req: {accessToken: {userId: 9}}, args: {hasRoute: true}};
+ const args = {hasRoute: true};
+ ctx.args = args;
const filter = {};
const result = await models.Ticket.filter(ctx, filter, options);
@@ -247,7 +261,8 @@ describe('ticket filter()', () => {
try {
const options = {transaction: tx};
- const ctx = {req: {accessToken: {userId: 9}}, args: {hasRoute: false}};
+ const args = {hasRoute: false};
+ ctx.args = args;
const filter = {};
const result = await models.Ticket.filter(ctx, filter, options);
@@ -266,7 +281,8 @@ describe('ticket filter()', () => {
try {
const options = {transaction: tx};
- const ctx = {req: {accessToken: {userId: 9}}, args: {hasRoute: null}};
+ const args = {hasRoute: null};
+ ctx.args = args;
const filter = {};
const result = await models.Ticket.filter(ctx, filter, options);
@@ -285,7 +301,8 @@ describe('ticket filter()', () => {
try {
const options = {transaction: tx};
- const ctx = {req: {accessToken: {userId: 9}}, args: {hasInvoice: true}};
+ const args = {hasInvoice: true};
+ ctx.args = args;
const filter = {};
const result = await models.Ticket.filter(ctx, filter, options);
@@ -304,7 +321,8 @@ describe('ticket filter()', () => {
try {
const options = {transaction: tx};
- const ctx = {req: {accessToken: {userId: 9}}, args: {hasInvoice: null}};
+ const args = {hasInvoice: null};
+ ctx.args = args;
const filter = {};
const result = await models.Ticket.filter(ctx, filter, options);
diff --git a/modules/ticket/back/methods/ticket/specs/getTicketsAdvance.spec.js b/modules/ticket/back/methods/ticket/specs/getTicketsAdvance.spec.js
index 5a3209a6d..488cd1fc2 100644
--- a/modules/ticket/back/methods/ticket/specs/getTicketsAdvance.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/getTicketsAdvance.spec.js
@@ -1,6 +1,7 @@
const models = require('vn-loopback/server/server').models;
describe('TicketFuture getTicketsAdvance()', () => {
+ const ctx = beforeAll.getCtx();
const today = Date.vnNew();
today.setHours(0, 0, 0, 0);
let tomorrow = Date.vnNew();
@@ -18,7 +19,7 @@ describe('TicketFuture getTicketsAdvance()', () => {
warehouseFk: 1,
};
- const ctx = {req: {accessToken: {userId: 9}}, args};
+ ctx.args = args;
const result = await models.Ticket.getTicketsAdvance(ctx, options);
expect(result.length).toBeGreaterThan(0);
@@ -42,7 +43,7 @@ describe('TicketFuture getTicketsAdvance()', () => {
isFullMovable: true
};
- const ctx = {req: {accessToken: {userId: 9}}, args};
+ ctx.args = args;
const result = await models.Ticket.getTicketsAdvance(ctx, options);
expect(result.length).toBeGreaterThan(0);
@@ -67,7 +68,7 @@ describe('TicketFuture getTicketsAdvance()', () => {
isFullMovable: false
};
- const ctx = {req: {accessToken: {userId: 9}}, args};
+ ctx.args = args;
const result = await models.Ticket.getTicketsAdvance(ctx, options);
expect(result.length).toEqual(0);
@@ -92,7 +93,7 @@ describe('TicketFuture getTicketsAdvance()', () => {
ipt: 'V'
};
- const ctx = {req: {accessToken: {userId: 9}}, args};
+ ctx.args = args;
const result = await models.Ticket.getTicketsAdvance(ctx, options);
expect(result.length).toBeGreaterThan(5);
@@ -117,7 +118,7 @@ describe('TicketFuture getTicketsAdvance()', () => {
tfIpt: 'V'
};
- const ctx = {req: {accessToken: {userId: 9}}, args};
+ ctx.args = args;
const result = await models.Ticket.getTicketsAdvance(ctx, options);
expect(result.length).toBeGreaterThan(5);
diff --git a/modules/ticket/back/methods/ticket/specs/getTicketsFuture.spec.js b/modules/ticket/back/methods/ticket/specs/getTicketsFuture.spec.js
index 44896493f..4b28f34ea 100644
--- a/modules/ticket/back/methods/ticket/specs/getTicketsFuture.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/getTicketsFuture.spec.js
@@ -1,6 +1,7 @@
const models = require('vn-loopback/server/server').models;
describe('ticket getTicketsFuture()', () => {
+ const ctx = beforeAll.getCtx();
const today = Date.vnNew();
today.setHours(0, 0, 0, 0);
@@ -16,7 +17,7 @@ describe('ticket getTicketsFuture()', () => {
warehouseFk: 1,
};
- const ctx = {req: {accessToken: {userId: 9}}, args};
+ ctx.args = args;
const result = await models.Ticket.getTicketsFuture(ctx, options);
expect(result.length).toBeGreaterThan(0);
@@ -40,7 +41,7 @@ describe('ticket getTicketsFuture()', () => {
problems: true
};
- const ctx = {req: {accessToken: {userId: 9}}, args};
+ ctx.args = args;
const result = await models.Ticket.getTicketsFuture(ctx, options);
expect(result.length).toBeGreaterThan(0);
@@ -65,7 +66,7 @@ describe('ticket getTicketsFuture()', () => {
problems: false
};
- const ctx = {req: {accessToken: {userId: 9}}, args};
+ ctx.args = args;
const result = await models.Ticket.getTicketsFuture(ctx, options);
expect(result.length).toEqual(0);
@@ -90,7 +91,7 @@ describe('ticket getTicketsFuture()', () => {
problems: null
};
- const ctx = {req: {accessToken: {userId: 9}}, args};
+ ctx.args = args;
const result = await models.Ticket.getTicketsFuture(ctx, options);
expect(result.length).toBeGreaterThan(0);
@@ -115,7 +116,7 @@ describe('ticket getTicketsFuture()', () => {
state: 'OK'
};
- const ctx = {req: {accessToken: {userId: 9}}, args};
+ ctx.args = args;
const result = await models.Ticket.getTicketsFuture(ctx, options);
expect(result.length).toBeGreaterThan(0);
@@ -140,7 +141,7 @@ describe('ticket getTicketsFuture()', () => {
futureState: 'OK'
};
- const ctx = {req: {accessToken: {userId: 9}}, args};
+ ctx.args = args;
const result = await models.Ticket.getTicketsFuture(ctx, options);
expect(result.length).toBeGreaterThan(0);
@@ -165,7 +166,7 @@ describe('ticket getTicketsFuture()', () => {
ipt: null
};
- const ctx = {req: {accessToken: {userId: 9}}, args};
+ ctx.args = args;
const result = await models.Ticket.getTicketsFuture(ctx, options);
expect(result.length).toBeGreaterThan(0);
@@ -190,7 +191,7 @@ describe('ticket getTicketsFuture()', () => {
ipt: 'H'
};
- const ctx = {req: {accessToken: {userId: 9}}, args};
+ ctx.args = args;
const result = await models.Ticket.getTicketsFuture(ctx, options);
expect(result.length).toBeGreaterThan(0);
@@ -215,7 +216,7 @@ describe('ticket getTicketsFuture()', () => {
futureIpt: null
};
- const ctx = {req: {accessToken: {userId: 9}}, args};
+ ctx.args = args;
const result = await models.Ticket.getTicketsFuture(ctx, options);
expect(result.length).toBeGreaterThan(0);
@@ -240,7 +241,7 @@ describe('ticket getTicketsFuture()', () => {
futureIpt: 'H'
};
- const ctx = {req: {accessToken: {userId: 9}}, args};
+ ctx.args = args;
const result = await models.Ticket.getTicketsFuture(ctx, options);
expect(result.length).toBeGreaterThan(0);
@@ -265,7 +266,7 @@ describe('ticket getTicketsFuture()', () => {
id: 13
};
- const ctx = {req: {accessToken: {userId: 9}}, args};
+ ctx.args = args;
const result = await models.Ticket.getTicketsFuture(ctx, options);
expect(result.length).toBeGreaterThan(0);
@@ -290,7 +291,7 @@ describe('ticket getTicketsFuture()', () => {
futureId: 12
};
- const ctx = {req: {accessToken: {userId: 9}}, args};
+ ctx.args = args;
const result = await models.Ticket.getTicketsFuture(ctx, options);
expect(result.length).toBeGreaterThan(0);
diff --git a/modules/ticket/back/methods/ticket/specs/isEditableOrThrow.spec.js b/modules/ticket/back/methods/ticket/specs/isEditableOrThrow.spec.js
index bdf547325..883b0de2e 100644
--- a/modules/ticket/back/methods/ticket/specs/isEditableOrThrow.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/isEditableOrThrow.spec.js
@@ -1,14 +1,12 @@
const models = require('vn-loopback/server/server').models;
describe('ticket isEditableOrThrow()', () => {
+ const ctx = beforeAll.getCtx();
it('should throw an error as the ticket does not exist', async() => {
const tx = await models.Ticket.beginTransaction({});
let error;
try {
const options = {transaction: tx};
- const ctx = {
- req: {accessToken: {userId: 9}}
- };
await models.Ticket.isEditableOrThrow(ctx, 9999, options);
await tx.rollback();
diff --git a/modules/ticket/back/methods/ticket/specs/merge.spec.js b/modules/ticket/back/methods/ticket/specs/merge.spec.js
index 646b9739f..68f9d3393 100644
--- a/modules/ticket/back/methods/ticket/specs/merge.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/merge.spec.js
@@ -1,7 +1,7 @@
const models = require('vn-loopback/server/server').models;
-const LoopBackContext = require('loopback-context');
describe('ticket merge()', () => {
+ const ctx = beforeAll.getCtx();
const tickets = {
originId: 13,
destinationId: 12,
@@ -10,30 +10,6 @@ describe('ticket merge()', () => {
workerFk: 1
};
- beforeAll(async() => {
- const activeCtx = {
- accessToken: {userId: 9},
- http: {
- req: {
- headers: {origin: 'http://localhost'}
- }
- }
- };
- spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
- active: activeCtx
- });
- });
-
- const ctx = {
- req: {
- accessToken: {userId: 9},
- headers: {origin: 'http://localhost:5000'},
- }
- };
- ctx.req.__ = value => {
- return value;
- };
-
it('should merge two tickets', async() => {
const tx = await models.Ticket.beginTransaction({});
diff --git a/modules/ticket/back/methods/ticket/specs/priceDifference.spec.js b/modules/ticket/back/methods/ticket/specs/priceDifference.spec.js
index e5c06b6dd..7dc1c8ed2 100644
--- a/modules/ticket/back/methods/ticket/specs/priceDifference.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/priceDifference.spec.js
@@ -42,7 +42,7 @@ describe('sale priceDifference()', () => {
try {
const options = {transaction: tx};
- const ctx = {req: {accessToken: {userId: 1106}}};
+ const ctx = {req: {accessToken: {userId: 1105}}};
ctx.args = {
id: 1,
landed: Date.vnNew(),
@@ -84,7 +84,7 @@ describe('sale priceDifference()', () => {
const {items} = await models.Ticket.priceDifference(ctx, options);
- expect(items[0].movable).toEqual(410);
+ expect(items[0].movable).toEqual(386);
expect(items[1].movable).toEqual(1810);
await tx.rollback();
diff --git a/modules/ticket/back/methods/ticket/specs/recalculateComponents.spec.js b/modules/ticket/back/methods/ticket/specs/recalculateComponents.spec.js
index d358a79f5..f9c7284f5 100644
--- a/modules/ticket/back/methods/ticket/specs/recalculateComponents.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/recalculateComponents.spec.js
@@ -3,6 +3,7 @@ const ForbiddenError = require('vn-loopback/util/forbiddenError');
describe('ticket recalculateComponents()', () => {
const ticketId = 11;
+ const ctx = beforeAll.getCtx();
it('should update the ticket components', async() => {
const tx = await models.Ticket.beginTransaction({});
@@ -10,7 +11,6 @@ describe('ticket recalculateComponents()', () => {
try {
const options = {transaction: tx};
- const ctx = {req: {accessToken: {userId: 9}}};
const response = await models.Ticket.recalculateComponents(ctx, ticketId, options);
expect(response.affectedRows).toBeDefined();
@@ -29,7 +29,6 @@ describe('ticket recalculateComponents()', () => {
try {
const options = {transaction: tx};
- const ctx = {req: {accessToken: {userId: 9}}};
const immutableTicketId = 1;
await models.Ticket.recalculateComponents(ctx, immutableTicketId, options);
diff --git a/modules/ticket/back/methods/ticket/specs/sendSms.spec.js b/modules/ticket/back/methods/ticket/specs/sendSms.spec.js
index afc1ada54..2a7b82ea0 100644
--- a/modules/ticket/back/methods/ticket/specs/sendSms.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/sendSms.spec.js
@@ -1,13 +1,13 @@
const models = require('vn-loopback/server/server').models;
describe('ticket sendSms()', () => {
+ const ctx = beforeAll.getCtx();
it('should send a message and log it', async() => {
const tx = await models.Ticket.beginTransaction({});
try {
const options = {transaction: tx};
- const ctx = {req: {accessToken: {userId: 9}}};
const id = 11;
const destination = 222222222;
const message = 'this is the message created in a test';
diff --git a/modules/ticket/back/methods/ticket/specs/setDeleted.spec.js b/modules/ticket/back/methods/ticket/specs/setDeleted.spec.js
index 520a9e403..ed9347714 100644
--- a/modules/ticket/back/methods/ticket/specs/setDeleted.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/setDeleted.spec.js
@@ -1,17 +1,8 @@
const models = require('vn-loopback/server/server').models;
-const LoopBackContext = require('loopback-context');
describe('ticket setDeleted()', () => {
- const userId = 1106;
- const activeCtx = {
- accessToken: {userId: userId},
- };
-
- beforeEach(() => {
- spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
- active: activeCtx
- });
- });
+ const ctx = beforeAll.getCtx();
+ beforeAll.mockLoopBackContext();
it('should throw an error if the given ticket has a claim', async() => {
const tx = await models.Ticket.beginTransaction({});
@@ -20,7 +11,6 @@ describe('ticket setDeleted()', () => {
try {
const options = {transaction: tx};
- const ctx = {req: activeCtx};
const ticketId = 16;
await models.Ticket.setDeleted(ctx, ticketId, options);
@@ -40,16 +30,7 @@ describe('ticket setDeleted()', () => {
try {
const options = {transaction: tx};
- const ctx = {
- req: {
- accessToken: {userId: 9},
- headers: {origin: 'http://localhost:5000'},
- }
- };
- ctx.req.__ = value => {
- return value;
- };
- const ticketId = 23;
+ const ticketId = 24;
const [sectorCollectionBefore] = await models.Ticket.rawSql(
`SELECT COUNT(*) numberRows
FROM vn.sectorCollection`, [], options);
@@ -75,19 +56,10 @@ describe('ticket setDeleted()', () => {
try {
const options = {transaction: tx};
- const ctx = {
- req: {
- accessToken: {userId: 9},
- headers: {origin: 'http://localhost:5000'},
- }
- };
- ctx.req.__ = value => {
- return value;
- };
const [ticketCollectionOld] = await models.Ticket.rawSql(
`SELECT COUNT(*) numberRows
FROM vn.ticketCollection`, [], options);
- const ticketId = 23;
+ const ticketId = 34;
await models.Ticket.setDeleted(ctx, ticketId, options);
@@ -110,16 +82,6 @@ describe('ticket setDeleted()', () => {
try {
const options = {transaction: tx};
- const ctx = {
- req: {
- accessToken: {userId: 9},
- headers: {origin: 'http://localhost:5000'},
- }
- };
- ctx.req.__ = value => {
- return value;
- };
-
const ticketId = 8;
await models.Ticket.setDeleted(ctx, ticketId, options);
diff --git a/modules/ticket/back/methods/ticket/specs/state.spec.js b/modules/ticket/back/methods/ticket/specs/state.spec.js
index 947e72b79..04abd4ca8 100644
--- a/modules/ticket/back/methods/ticket/specs/state.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/state.spec.js
@@ -1,14 +1,11 @@
const models = require('vn-loopback/server/server').models;
const LoopBackContext = require('loopback-context');
-describe('ticket state()', () => {
+xdescribe('ticket state()', () => {
+ const ctx = beforeAll.getCtx();
const salesPersonId = 18;
const employeeId = 1;
const productionId = 49;
- const activeCtx = {
- accessToken: {userId: 9},
- };
- const ctx = {req: activeCtx};
const now = Date.vnNew();
const sampleTicket = {
shipped: now,
@@ -32,7 +29,7 @@ describe('ticket state()', () => {
beforeAll(async() => {
spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
- active: activeCtx
+ active: ctx
});
});
@@ -44,7 +41,7 @@ describe('ticket state()', () => {
try {
const options = {transaction: tx};
- activeCtx.accessToken.userId = salesPersonId;
+ ctx.req.accessToken.userId = salesPersonId;
await models.Ticket.state(ctx, {ticketFk: 2, stateFk: 3}, options);
@@ -65,7 +62,7 @@ describe('ticket state()', () => {
try {
const options = {transaction: tx};
- activeCtx.accessToken.userId = employeeId;
+ ctx.req.accessToken.userId = employeeId;
await models.Ticket.state(ctx, {ticketFk: 11, stateFk: 13}, options);
@@ -87,8 +84,9 @@ describe('ticket state()', () => {
const ticket = await models.Ticket.create(sampleTicket, options);
- activeCtx.accessToken.userId = productionId;
- const params = {ticketFk: ticket.id, stateFk: 3};
+ ctx.req.accessToken.userId = productionId;
+ const stateOk = await models.State.findOne({where: {code: 'OK'}}, options);
+ const params = {ticketFk: ticket.id, stateFk: stateOk.id};
const ticketTracking = await models.Ticket.state(ctx, params, options);
@@ -111,17 +109,103 @@ describe('ticket state()', () => {
try {
const options = {transaction: tx};
+ spyOn(models.Chat, 'sendCheckingPresence').and.callThrough();
const ticket = await models.Ticket.create(sampleTicket, options);
- const ctx = {req: {accessToken: {userId: 18}}};
+ ctx.req.accessToken.userId = salesPersonId;
const assignedState = await models.State.findOne({where: {code: 'PICKER_DESIGNED'}}, options);
- const params = {ticketFk: ticket.id, stateFk: assignedState.id, userFk: 1};
- const res = await models.Ticket.state(ctx, params, options);
+ const paramsAssigned = {ticketFk: ticket.id, stateFk: assignedState.id, userFk: 1};
+ const resAssigned = await models.Ticket.state(ctx, paramsAssigned, options);
- expect(res.ticketFk).toBe(params.ticketFk);
- expect(res.stateFk).toBe(params.stateFk);
- expect(res.userFk).toBe(params.userFk);
- expect(res.userFk).toBe(1);
- expect(res.id).toBeDefined();
+ expect(resAssigned.ticketFk).toBe(paramsAssigned.ticketFk);
+ expect(resAssigned.stateFk).toBe(paramsAssigned.stateFk);
+ expect(resAssigned.userFk).toBe(paramsAssigned.userFk);
+ expect(resAssigned.userFk).toBe(1);
+ expect(resAssigned.id).toBeDefined();
+ expect(models.Chat.sendCheckingPresence).not.toHaveBeenCalled();
+
+ ctx.req.accessToken.userId = productionId;
+ const packedState = await models.State.findOne({where: {code: 'PACKED'}}, options);
+ const paramsPacked = {ticketFk: ticket.id, stateFk: packedState.id, userFk: salesPersonId};
+ const resPacked = await models.Ticket.state(ctx, paramsPacked, options);
+
+ expect(resPacked.stateFk).toBe(paramsPacked.stateFk);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+
+ it('Should equalize the quantities of quantity and originalQuantity' +
+ ' if they are different', async() => {
+ const tx = await models.TicketTracking.beginTransaction({});
+
+ try {
+ const options = {transaction: tx};
+
+ const ticket = await models.Ticket.create(sampleTicket, options);
+ ctx.req.accessToken.userId = salesPersonId;
+
+ const sampleSale = {
+ ticketFk: ticket.id,
+ itemFk: 1,
+ concept: 'Test',
+ quantity: 10,
+ originalQuantity: 6
+ };
+ await models.Sale.create(sampleSale, options);
+ const assignedState = await models.State.findOne({where: {code: 'PICKER_DESIGNED'}}, options);
+ const paramsAssigned = {ticketFk: ticket.id, stateFk: assignedState.id, userFk: 1};
+ const resAssigned = await models.Ticket.state(ctx, paramsAssigned, options);
+
+ expect(resAssigned.ticketFk).toBe(paramsAssigned.ticketFk);
+ expect(resAssigned.stateFk).toBe(paramsAssigned.stateFk);
+ expect(resAssigned.userFk).toBe(paramsAssigned.userFk);
+ expect(resAssigned.userFk).toBe(1);
+ expect(resAssigned.id).toBeDefined();
+
+ ctx.req.accessToken.userId = productionId;
+ const packedState = await models.State.findOne({where: {code: 'PACKED'}}, options);
+ const paramsPacked = {ticketFk: ticket.id, stateFk: packedState.id, userFk: salesPersonId};
+ const resPacked = await models.Ticket.state(ctx, paramsPacked, options);
+
+ const sale = await models.Sale.findOne({where: {ticketFk: ticket.id}}, options);
+
+ expect(resPacked.stateFk).toBe(paramsPacked.stateFk);
+ expect(sale.quantity).toBe(sale.originalQuantity);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+
+ it('should not call sendCheckingPresence if sales.length is 0 because quantities are equal', async() => {
+ const tx = await models.TicketTracking.beginTransaction({});
+ spyOn(models.Chat, 'sendCheckingPresence').and.callThrough();
+
+ try {
+ const options = {transaction: tx};
+ const ticket = await models.Ticket.create(sampleTicket, options);
+ activeCtx.accessToken.userId = productionId;
+
+ const sampleSale = {
+ ticketFk: ticket.id,
+ itemFk: 1,
+ concept: 'Test',
+ quantity: 10,
+ originalQuantity: 10
+ };
+ await models.Sale.create(sampleSale, options);
+
+ const packedState = await models.State.findOne({where: {code: 'PACKED'}}, options);
+ const params = {ticketFk: ticket.id, stateFk: packedState.id};
+
+ await models.Ticket.state(ctx, params, options);
+
+ expect(models.Chat.sendCheckingPresence).not.toHaveBeenCalled();
await tx.rollback();
} catch (e) {
diff --git a/modules/ticket/back/methods/ticket/specs/transferClient.spec.js b/modules/ticket/back/methods/ticket/specs/transferClient.spec.js
index 5f1c09776..01fd8fcbe 100644
--- a/modules/ticket/back/methods/ticket/specs/transferClient.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/transferClient.spec.js
@@ -4,18 +4,11 @@ describe('Ticket transferClient()', () => {
const originalTicketId = 8;
const refundTicketId = 24;
const clientId = 1;
- let ctx;
+
+ const ctx = beforeAll.getCtx();
let options;
let tx;
beforeEach(async() => {
- ctx = {
- req: {
- accessToken: {userId: 9},
- headers: {origin: 'http://localhost'}
- },
- args: {}
- };
-
options = {transaction: tx};
tx = await models.Ticket.beginTransaction({});
options.transaction = tx;
diff --git a/modules/ticket/back/methods/ticket/specs/updateDiscount.spec.js b/modules/ticket/back/methods/ticket/specs/updateDiscount.spec.js
index 41de1fd6e..272387a30 100644
--- a/modules/ticket/back/methods/ticket/specs/updateDiscount.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/updateDiscount.spec.js
@@ -1,20 +1,8 @@
const models = require('vn-loopback/server/server').models;
-const LoopBackContext = require('loopback-context');
describe('sale updateDiscount()', () => {
- beforeAll(async() => {
- const activeCtx = {
- accessToken: {userId: 9},
- http: {
- req: {
- headers: {origin: 'http://localhost'}
- }
- }
- };
- spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
- active: activeCtx
- });
- });
+ const ctx = beforeAll.getCtx();
+ beforeAll.mockLoopBackContext();
const originalSaleId = 8;
it('should throw an error if no sales were selected', async() => {
@@ -24,13 +12,6 @@ describe('sale updateDiscount()', () => {
try {
const options = {transaction: tx};
- const ctx = {
- req: {
- accessToken: {userId: 9},
- headers: {origin: 'localhost:5000'},
- __: () => {}
- }
- };
const ticketId = 11;
const sales = [];
const newDiscount = 10;
@@ -53,13 +34,6 @@ describe('sale updateDiscount()', () => {
try {
const options = {transaction: tx};
- const ctx = {
- req: {
- accessToken: {userId: 9},
- headers: {origin: 'localhost:5000'},
- __: () => {}
- }
- };
const ticketId = 11;
const sales = [1, 14];
const newDiscount = 10;
@@ -82,13 +56,6 @@ describe('sale updateDiscount()', () => {
try {
const options = {transaction: tx};
- const ctx = {
- req: {
- accessToken: {userId: 9},
- headers: {origin: 'localhost:5000'},
- __: () => {}
- }
- };
const ticketId = 1;
const sales = [1];
const newDiscount = 100;
@@ -106,17 +73,11 @@ describe('sale updateDiscount()', () => {
it('should update the discount if the salesPerson has mana and manaCode = "mana"', async() => {
const tx = await models.Ticket.beginTransaction({});
+ const ctx = beforeAll.getCtx(18);
try {
const options = {transaction: tx};
- const ctx = {
- req: {
- accessToken: {userId: 18},
- headers: {origin: 'localhost:5000'},
- __: () => {}
- }
- };
const ticketId = 11;
const sales = [originalSaleId];
const newDiscount = 100;
@@ -151,17 +112,11 @@ describe('sale updateDiscount()', () => {
it('should update the discount if the salesPerson has mana and manaCode = "manaClaim"', async() => {
const tx = await models.Ticket.beginTransaction({});
+ const ctx = beforeAll.getCtx(18);
try {
const options = {transaction: tx};
- const ctx = {
- req: {
- accessToken: {userId: 18},
- headers: {origin: 'localhost:5000'},
- __: () => {}
- }
- };
const ticketId = 11;
const sales = [originalSaleId];
const newDiscount = 100;
@@ -200,13 +155,6 @@ describe('sale updateDiscount()', () => {
try {
const options = {transaction: tx};
- const ctx = {
- req: {
- accessToken: {userId: 9},
- headers: {origin: 'localhost:5000'},
- __: () => {}
- }
- };
const ticketId = 11;
const sales = [originalSaleId];
const newDiscount = 100;
diff --git a/modules/ticket/back/methods/ticket/summary.js b/modules/ticket/back/methods/ticket/summary.js
index 1ce91e1b2..6bfa478ec 100644
--- a/modules/ticket/back/methods/ticket/summary.js
+++ b/modules/ticket/back/methods/ticket/summary.js
@@ -56,6 +56,7 @@ module.exports = Self => {
const filter = {
include: [
{relation: 'warehouse', scope: {fields: ['name']}},
+ {relation: 'ticketCollections', scope: {fields: ['collectionFk']}},
{relation: 'agencyMode', scope: {fields: ['name']}},
{relation: 'zone', scope: {fields: ['name']}},
{relation: 'client',
diff --git a/modules/ticket/back/models/component-type.json b/modules/ticket/back/models/component-type.json
index 26daf5216..735227a35 100644
--- a/modules/ticket/back/models/component-type.json
+++ b/modules/ticket/back/models/component-type.json
@@ -12,7 +12,7 @@
"type": "number",
"description": "Identifier"
},
- "type": {
+ "name": {
"type": "string"
},
"isBase":{
diff --git a/modules/ticket/back/models/expedition-state.json b/modules/ticket/back/models/expedition-state.json
index eda0f79fd..159a9275e 100644
--- a/modules/ticket/back/models/expedition-state.json
+++ b/modules/ticket/back/models/expedition-state.json
@@ -3,7 +3,7 @@
"base": "VnModel",
"options": {
"mysql": {
- "table": "expeditionState"
+ "table": "expeditionState"
}
},
"properties": {
@@ -23,13 +23,16 @@
},
"userFk": {
"type": "number"
+ },
+ "isScanned": {
+ "type": "boolean"
}
},
"relations": {
- "expeditionStateType": {
- "type": "belongsTo",
- "model": "ExpeditionStateType",
- "foreignKey": "typeFk"
- }
+ "expeditionStateType": {
+ "type": "belongsTo",
+ "model": "ExpeditionStateType",
+ "foreignKey": "typeFk"
+ }
}
-}
+}
\ No newline at end of file
diff --git a/modules/ticket/back/models/expeditionPallet.json b/modules/ticket/back/models/expeditionPallet.json
index cab3af6ec..64b3092ae 100644
--- a/modules/ticket/back/models/expeditionPallet.json
+++ b/modules/ticket/back/models/expeditionPallet.json
@@ -23,9 +23,9 @@
}
},
"relations": {
- "expeditionTruck": {
+ "roadmapStop": {
"type": "belongsTo",
- "model": "ExpeditionTruck",
+ "model": "RoadmapStop",
"foreignKey": "truckFk"
}
}
diff --git a/modules/ticket/back/models/saleGroup.json b/modules/ticket/back/models/saleGroup.json
index d5cf82cb5..aa78b4167 100644
--- a/modules/ticket/back/models/saleGroup.json
+++ b/modules/ticket/back/models/saleGroup.json
@@ -14,6 +14,9 @@
},
"parkingFk": {
"type": "number"
+ },
+ "ticketFk": {
+ "type": "number"
}
},
"relations": {
diff --git a/modules/ticket/back/models/specs/sale.spec.js b/modules/ticket/back/models/specs/sale.spec.js
index d078dc8e2..1aa40802b 100644
--- a/modules/ticket/back/models/specs/sale.spec.js
+++ b/modules/ticket/back/models/specs/sale.spec.js
@@ -1,361 +1,318 @@
/* eslint max-len: ["error", { "code": 150 }]*/
-
-const models = require('vn-loopback/server/server').models;
+const {models} = require('vn-loopback/server/server');
const LoopBackContext = require('loopback-context');
describe('sale model ', () => {
- const ctx = {
- req: {
- accessToken: {userId: 9},
- headers: {origin: 'localhost:5000'},
- __: () => {}
- }
- };
- function getActiveCtx(userId) {
- return {
- active: {
- accessToken: {userId},
- http: {
- req: {
- headers: {origin: 'http://localhost'}
- }
- }
- }
- };
+ const developerId = 9;
+ const buyerId = 35;
+ const employeeId = 1;
+ const productionId = 49;
+ const salesPersonId = 18;
+ const reviewerId = 130;
+
+ const barcode = '4444444444';
+ const ticketCollectionProd = 34;
+ const ticketCollectionSalesPerson = 35;
+ const previaTicketSalesPerson = 36;
+ const previaTicketProd = 37;
+ const notEditableError = 'This ticket is not editable.';
+
+ const ctx = getCtx(developerId);
+ let tx;
+ let opts;
+
+ function getCtx(userId, active = false) {
+ const accessToken = {userId};
+ const headers = {origin: 'localhost:5000'};
+ if (!active) return {req: {accessToken, headers, __: () => {}}};
+ return {active: {accessToken, http: {req: {headers}}}};
}
+ beforeEach(async() => {
+ tx = await models.Sale.beginTransaction({});
+ opts = {transaction: tx};
+ });
+
+ afterEach(async() => await tx.rollback());
+
describe('quantity field ', () => {
it('should add quantity if the quantity is greater than it should be and is role advanced', async() => {
const saleId = 17;
- const buyerId = 35;
- const ctx = {
- req: {
- accessToken: {userId: buyerId},
- headers: {origin: 'localhost:5000'},
- __: () => {}
- }
- };
- const tx = await models.Sale.beginTransaction({});
- spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getActiveCtx(buyerId));
- spyOn(models.Sale, 'rawSql').and.callFake((sqlStatement, params, options) => {
+ const ctx = getCtx(buyerId);
+
+ spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getCtx(buyerId, true));
+ spyOn(models.Sale, 'rawSql').and.callFake((sqlStatement, params, opts) => {
if (sqlStatement.includes('catalog_calcFromItem')) {
sqlStatement = `CREATE OR REPLACE TEMPORARY TABLE tmp.ticketCalculateItem ENGINE = MEMORY
SELECT 100 as available;`;
params = null;
}
- return models.Ticket.rawSql(sqlStatement, params, options);
+ return models.Ticket.rawSql(sqlStatement, params, opts);
});
- try {
- const options = {transaction: tx};
+ const isRoleAdvanced = await models.ACL.checkAccessAcl(ctx, 'Ticket', 'isRoleAdvanced', '*');
- const isRoleAdvanced = await models.ACL.checkAccessAcl(ctx, 'Ticket', 'isRoleAdvanced', '*');
+ expect(isRoleAdvanced).toEqual(true);
- expect(isRoleAdvanced).toEqual(true);
+ const originalLine = await models.Sale.findOne({where: {id: saleId}, fields: ['quantity']}, opts);
- const originalLine = await models.Sale.findOne({where: {id: saleId}, fields: ['quantity']}, options);
+ expect(originalLine.quantity).toEqual(30);
- expect(originalLine.quantity).toEqual(30);
+ const newQuantity = originalLine.quantity + 1;
+ await models.Sale.updateQuantity(ctx, saleId, newQuantity, opts);
- const newQuantity = originalLine.quantity + 1;
- await models.Sale.updateQuantity(ctx, saleId, newQuantity, options);
+ const modifiedLine = await models.Sale.findOne({where: {id: saleId}, fields: ['quantity']}, opts);
- const modifiedLine = await models.Sale.findOne({where: {id: saleId}, fields: ['quantity']}, options);
-
- expect(modifiedLine.quantity).toEqual(newQuantity);
-
- await tx.rollback();
- } catch (e) {
- await tx.rollback();
- throw e;
- }
+ expect(modifiedLine.quantity).toEqual(newQuantity);
});
it('should update the quantity of a given sale current line', async() => {
- spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getActiveCtx(9));
+ spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getCtx(developerId, true));
- const tx = await models.Sale.beginTransaction({});
const saleId = 25;
const newQuantity = 4;
- try {
- const options = {transaction: tx};
+ const originalLine = await models.Sale.findOne({where: {id: saleId}, fields: ['quantity']}, opts);
- const originalLine = await models.Sale.findOne({where: {id: saleId}, fields: ['quantity']}, options);
+ expect(originalLine.quantity).toEqual(20);
- expect(originalLine.quantity).toEqual(20);
+ await models.Sale.updateQuantity(ctx, saleId, newQuantity, opts);
- await models.Sale.updateQuantity(ctx, saleId, newQuantity, options);
+ const modifiedLine = await models.Sale.findOne({where: {id: saleId}, fields: ['quantity']}, opts);
- const modifiedLine = await models.Sale.findOne({where: {id: saleId}, fields: ['quantity']}, options);
-
- expect(modifiedLine.quantity).toEqual(newQuantity);
-
- await tx.rollback();
- } catch (e) {
- await tx.rollback();
- throw e;
- }
+ expect(modifiedLine.quantity).toEqual(newQuantity);
});
it('should throw an error if the quantity is negative and it is not a refund ticket', async() => {
- const ctx = {
- req: {
- accessToken: {userId: 1},
- headers: {origin: 'localhost:5000'},
- __: () => {}
- }
- };
- spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getActiveCtx(1));
+ spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getCtx(employeeId, true));
const saleId = 17;
const newQuantity = -10;
- const tx = await models.Sale.beginTransaction({});
-
- let error;
try {
- const options = {transaction: tx};
-
- await models.Sale.updateQuantity(ctx, saleId, newQuantity, options);
-
- await tx.rollback();
+ await models.Sale.updateQuantity(ctx, saleId, newQuantity, opts);
} catch (e) {
- await tx.rollback();
- error = e;
+ expect(e).toEqual(new Error('You can only add negative amounts in refund tickets'));
}
-
- expect(error).toEqual(new Error('You can only add negative amounts in refund tickets'));
});
it('should update a negative quantity when is a ticket refund', async() => {
- spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getActiveCtx(9));
+ spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getCtx(developerId, true));
- const tx = await models.Sale.beginTransaction({});
const saleId = 32;
const newQuantity = -10;
- try {
- const options = {transaction: tx};
+ await models.Sale.updateQuantity(ctx, saleId, newQuantity, opts);
- await models.Sale.updateQuantity(ctx, saleId, newQuantity, options);
+ const modifiedLine = await models.Sale.findOne({where: {id: saleId}, fields: ['quantity']}, opts);
- const modifiedLine = await models.Sale.findOne({where: {id: saleId}, fields: ['quantity']}, options);
-
- expect(modifiedLine.quantity).toEqual(newQuantity);
-
- await tx.rollback();
- } catch (e) {
- await tx.rollback();
- throw e;
- }
+ expect(modifiedLine.quantity).toEqual(newQuantity);
});
it('should throw an error if the quantity is less than the minimum quantity of the item', async() => {
- const ctx = {
- req: {
- accessToken: {userId: 1},
- headers: {origin: 'localhost:5000'},
- __: () => {}
- }
- };
- spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getActiveCtx(1));
+ spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getCtx(employeeId, true));
- const tx = await models.Sale.beginTransaction({});
const itemId = 2;
const saleId = 17;
const minQuantity = 30;
const newQuantity = minQuantity - 1;
- let error;
try {
- const options = {transaction: tx};
-
- const item = await models.Item.findById(itemId, null, options);
- await item.updateAttribute('minQuantity', minQuantity, options);
- spyOn(models.Sale, 'rawSql').and.callFake((sqlStatement, params, options) => {
+ const item = await models.Item.findById(itemId, null, opts);
+ await item.updateAttribute('minQuantity', minQuantity, opts);
+ spyOn(models.Sale, 'rawSql').and.callFake((sqlStatement, params, opts) => {
if (sqlStatement.includes('catalog_calcFromItem')) {
sqlStatement = `CREATE OR REPLACE TEMPORARY TABLE tmp.ticketCalculateItem ENGINE = MEMORY
SELECT 100 as available;`;
params = null;
}
- return models.Ticket.rawSql(sqlStatement, params, options);
+ return models.Ticket.rawSql(sqlStatement, params, opts);
});
- await models.Sale.updateQuantity(ctx, saleId, newQuantity, options);
-
- await tx.rollback();
+ await models.Sale.updateQuantity(ctx, saleId, newQuantity, opts);
} catch (e) {
- await tx.rollback();
- error = e;
+ expect(e).toEqual(new Error('The amount cannot be less than the minimum'));
}
-
- expect(error).toEqual(new Error('The amount cannot be less than the minimum'));
});
it('should change quantity if has minimum quantity and new quantity is equal than item available', async() => {
- const ctx = {
- req: {
- accessToken: {userId: 1},
- headers: {origin: 'localhost:5000'},
- __: () => {}
- }
- };
- spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getActiveCtx(1));
+ spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getCtx(employeeId, true));
- const tx = await models.Sale.beginTransaction({});
const itemId = 2;
const saleId = 17;
const minQuantity = 30;
const newQuantity = minQuantity - 1;
- try {
- const options = {transaction: tx};
+ const item = await models.Item.findById(itemId, null, opts);
+ await item.updateAttribute('minQuantity', minQuantity, opts);
- const item = await models.Item.findById(itemId, null, options);
- await item.updateAttribute('minQuantity', minQuantity, options);
-
- spyOn(models.Sale, 'rawSql').and.callFake((sqlStatement, params, options) => {
- if (sqlStatement.includes('catalog_calcFromItem')) {
- sqlStatement = `CREATE OR REPLACE TEMPORARY TABLE tmp.ticketCalculateItem ENGINE = MEMORY
+ spyOn(models.Sale, 'rawSql').and.callFake((sqlStatement, params, opts) => {
+ if (sqlStatement.includes('catalog_calcFromItem')) {
+ sqlStatement = `CREATE OR REPLACE TEMPORARY TABLE tmp.ticketCalculateItem ENGINE = MEMORY
SELECT ${newQuantity} as available;`;
- params = null;
- }
- return models.Ticket.rawSql(sqlStatement, params, options);
- });
+ params = null;
+ }
+ return models.Ticket.rawSql(sqlStatement, params, opts);
+ });
- await models.Sale.updateQuantity(ctx, saleId, newQuantity, options);
-
- await tx.rollback();
- } catch (e) {
- await tx.rollback();
- throw e;
- }
+ await models.Sale.updateQuantity(ctx, saleId, newQuantity, opts);
});
describe('newPrice', () => {
it('should increase quantity if you have enough available and the new price is the same as the previous one', async() => {
- const ctx = {
- req: {
- accessToken: {userId: 1},
- headers: {origin: 'localhost:5000'},
- __: () => {}
- }
- };
- spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getActiveCtx(1));
+ spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getCtx(employeeId, true));
- const tx = await models.Sale.beginTransaction({});
const itemId = 2;
const saleId = 17;
const minQuantity = 30;
const newQuantity = 31;
- try {
- const options = {transaction: tx};
-
- const item = await models.Item.findById(itemId, null, options);
- await item.updateAttribute('minQuantity', minQuantity, options);
- spyOn(models.Sale, 'rawSql').and.callFake((sqlStatement, params, options) => {
- if (sqlStatement.includes('catalog_calcFromItem')) {
- sqlStatement = `
+ const item = await models.Item.findById(itemId, null, opts);
+ await item.updateAttribute('minQuantity', minQuantity, opts);
+ spyOn(models.Sale, 'rawSql').and.callFake((sqlStatement, params, opts) => {
+ if (sqlStatement.includes('catalog_calcFromItem')) {
+ sqlStatement = `
CREATE OR REPLACE TEMPORARY TABLE tmp.ticketCalculateItem ENGINE = MEMORY SELECT ${newQuantity} as available;
CREATE OR REPLACE TEMPORARY TABLE tmp.ticketComponentPrice ENGINE = MEMORY SELECT 1 as grouping, 7.07 as price;`;
- params = null;
- }
- return models.Ticket.rawSql(sqlStatement, params, options);
- });
+ params = null;
+ }
+ return models.Ticket.rawSql(sqlStatement, params, opts);
+ });
- await models.Sale.updateQuantity(ctx, saleId, newQuantity, options);
-
- await tx.rollback();
- } catch (e) {
- await tx.rollback();
- throw e;
- }
+ await models.Sale.updateQuantity(ctx, saleId, newQuantity, opts);
});
it('should increase quantity when the new price is lower than the previous one', async() => {
- const ctx = {
- req: {
- accessToken: {userId: 1},
- headers: {origin: 'localhost:5000'},
- __: () => {}
- }
- };
- spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getActiveCtx(1));
+ spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getCtx(employeeId, true));
- const tx = await models.Sale.beginTransaction({});
const itemId = 2;
const saleId = 17;
const minQuantity = 30;
const newQuantity = 31;
- try {
- const options = {transaction: tx};
-
- const item = await models.Item.findById(itemId, null, options);
- await item.updateAttribute('minQuantity', minQuantity, options);
- spyOn(models.Sale, 'rawSql').and.callFake((sqlStatement, params, options) => {
- if (sqlStatement.includes('catalog_calcFromItem')) {
- sqlStatement = `
+ const item = await models.Item.findById(itemId, null, opts);
+ await item.updateAttribute('minQuantity', minQuantity, opts);
+ spyOn(models.Sale, 'rawSql').and.callFake((sqlStatement, params, opts) => {
+ if (sqlStatement.includes('catalog_calcFromItem')) {
+ sqlStatement = `
CREATE OR REPLACE TEMPORARY TABLE tmp.ticketCalculateItem ENGINE = MEMORY SELECT ${newQuantity} as available;
CREATE OR REPLACE TEMPORARY TABLE tmp.ticketComponentPrice ENGINE = MEMORY SELECT 1 as grouping, 1 as price;`;
- params = null;
- }
- return models.Ticket.rawSql(sqlStatement, params, options);
- });
+ params = null;
+ }
+ return models.Ticket.rawSql(sqlStatement, params, opts);
+ });
- await models.Sale.updateQuantity(ctx, saleId, newQuantity, options);
-
- await tx.rollback();
- } catch (e) {
- await tx.rollback();
- throw e;
- }
+ await models.Sale.updateQuantity(ctx, saleId, newQuantity, opts);
});
it('should throw error when increase quantity and the new price is higher than the previous one', async() => {
- const ctx = {
- req: {
- accessToken: {userId: 1},
- headers: {origin: 'localhost:5000'},
- __: () => {}
- }
- };
- spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getActiveCtx(1));
+ spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getCtx(employeeId, true));
- const tx = await models.Sale.beginTransaction({});
const itemId = 2;
const saleId = 17;
const minQuantity = 30;
const newQuantity = 31;
- let error;
try {
- const options = {transaction: tx};
-
- const item = await models.Item.findById(itemId, null, options);
- await item.updateAttribute('minQuantity', minQuantity, options);
- spyOn(models.Sale, 'rawSql').and.callFake((sqlStatement, params, options) => {
+ const item = await models.Item.findById(itemId, null, opts);
+ await item.updateAttribute('minQuantity', minQuantity, opts);
+ spyOn(models.Sale, 'rawSql').and.callFake((sqlStatement, params, opts) => {
if (sqlStatement.includes('catalog_calcFromItem')) {
sqlStatement = `
CREATE OR REPLACE TEMPORARY TABLE tmp.ticketCalculateItem ENGINE = MEMORY SELECT ${newQuantity} as available;
CREATE OR REPLACE TEMPORARY TABLE tmp.ticketComponentPrice ENGINE = MEMORY SELECT 1 as grouping, 100000 as price;`;
params = null;
}
- return models.Ticket.rawSql(sqlStatement, params, options);
+ return models.Ticket.rawSql(sqlStatement, params, opts);
});
- await models.Sale.updateQuantity(ctx, saleId, newQuantity, options);
-
- await tx.rollback();
+ await models.Sale.updateQuantity(ctx, saleId, newQuantity, opts);
} catch (e) {
- await tx.rollback();
- error = e;
+ expect(e).toEqual(new Error('The price of the item changed'));
}
-
- expect(error).toEqual(new Error('The price of the item changed'));
});
});
});
+
+ describe('add a sale from a collection or previa ticket', () => {
+ it('if is allocated to them and alert level higher than 0 as Production role', async() => {
+ const ctx = getCtx(productionId);
+ spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getCtx(productionId, true));
+
+ const beforeSalesCollection = await models.Sale.count({ticketFk: ticketCollectionProd}, opts);
+ await models.Ticket.addSale(ctx, ticketCollectionProd, barcode, 20, opts);
+ const afterSalesCollection = await models.Sale.count({ticketFk: ticketCollectionProd}, opts);
+
+ expect(afterSalesCollection).toEqual(beforeSalesCollection + 1);
+
+ const beforeSalesPrevia = await models.Sale.count({ticketFk: previaTicketProd}, opts);
+ await models.Ticket.addSale(ctx, previaTicketProd, barcode, 20, opts);
+ const afterSalesPrevia = await models.Sale.count({ticketFk: previaTicketProd}, opts);
+
+ expect(afterSalesPrevia).toEqual(beforeSalesPrevia + 1);
+ });
+
+ it('should throw an error if is not allocated to them and alert level higher than 0 as Production role', async() => {
+ const ctx = getCtx(productionId);
+ spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getCtx(productionId, true));
+
+ try {
+ await models.Ticket.addSale(ctx, ticketCollectionSalesPerson, barcode, 20, opts);
+ } catch ({message}) {
+ expect(message).toEqual(notEditableError);
+ }
+
+ try {
+ await models.Ticket.addSale(ctx, previaTicketSalesPerson, barcode, 20, opts);
+ } catch ({message}) {
+ expect(message).toEqual(notEditableError);
+ }
+ });
+
+ it('if is allocated to them and alert level higher than 0 as salesPerson role', async() => {
+ const ctx = getCtx(salesPersonId);
+ spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getCtx(salesPersonId, true));
+
+ const beforeSalesCollection = await models.Sale.count({ticketFk: ticketCollectionSalesPerson}, opts);
+ await models.Ticket.addSale(ctx, ticketCollectionSalesPerson, barcode, 20, opts);
+ const afterSalesCollection = await models.Sale.count({ticketFk: ticketCollectionSalesPerson}, opts);
+
+ expect(afterSalesCollection).toEqual(beforeSalesCollection + 1);
+
+ const beforeSalesPrevia = await models.Sale.count({ticketFk: previaTicketSalesPerson}, opts);
+ await models.Ticket.addSale(ctx, previaTicketSalesPerson, barcode, 20, opts);
+ const afterSalesPrevia = await models.Sale.count({ticketFk: previaTicketSalesPerson}, opts);
+
+ expect(afterSalesPrevia).toEqual(beforeSalesPrevia + 1);
+ });
+
+ it('should throw an error if is not allocated to them and alert level higher than 0 as salesPerson role', async() => {
+ const ctx = getCtx(salesPersonId);
+
+ spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getCtx(salesPersonId, true));
+
+ try {
+ await models.Ticket.addSale(ctx, ticketCollectionProd, barcode, 20, opts);
+ } catch ({message}) {
+ expect(message).toEqual(notEditableError);
+ }
+ });
+
+ it('if is a reviewer', async() => {
+ const ctx = getCtx(reviewerId);
+ spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getCtx(reviewerId, true));
+
+ const beforeSalesCollection = await models.Sale.count({ticketFk: ticketCollectionSalesPerson}, opts);
+ await models.Ticket.addSale(ctx, ticketCollectionSalesPerson, barcode, 20, opts);
+ const afterSalesCollection = await models.Sale.count({ticketFk: ticketCollectionSalesPerson}, opts);
+
+ expect(afterSalesCollection).toEqual(beforeSalesCollection + 1);
+
+ const beforeSalesPrevia = await models.Sale.count({ticketFk: previaTicketSalesPerson}, opts);
+ await models.Ticket.addSale(ctx, previaTicketSalesPerson, barcode, 20, opts);
+ const afterSalesPrevia = await models.Sale.count({ticketFk: previaTicketSalesPerson}, opts);
+
+ expect(afterSalesPrevia).toEqual(beforeSalesPrevia + 1);
+ });
+ });
});
diff --git a/modules/ticket/back/models/specs/ticket-packaging.spec.js b/modules/ticket/back/models/specs/ticket-packaging.spec.js
index 6d59456a3..5e0ca82db 100644
--- a/modules/ticket/back/models/specs/ticket-packaging.spec.js
+++ b/modules/ticket/back/models/specs/ticket-packaging.spec.js
@@ -1,20 +1,7 @@
const app = require('vn-loopback/server/server');
-const LoopBackContext = require('loopback-context');
describe('ticket model TicketTracking', () => {
- beforeAll(async() => {
- const activeCtx = {
- accessToken: {userId: 9},
- http: {
- req: {
- headers: {origin: 'http://localhost'}
- }
- }
- };
- spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
- active: activeCtx
- });
- });
+ beforeAll.mockLoopBackContext();
let ticketTrackingId;
afterAll(async() => {
diff --git a/modules/ticket/back/models/ticket-log.json b/modules/ticket/back/models/ticket-log.json
index 32b4afd13..7b3f8b466 100644
--- a/modules/ticket/back/models/ticket-log.json
+++ b/modules/ticket/back/models/ticket-log.json
@@ -8,7 +8,8 @@
},
"properties": {
"id": {
- "type": "string"
+ "type": "number",
+ "id": true
},
"originFk": {
"type": "number"
@@ -39,6 +40,9 @@
},
"changedModelValue": {
"type": "string"
+ },
+ "summaryId": {
+ "type":"string"
}
}
}
diff --git a/modules/ticket/back/models/ticket-methods.js b/modules/ticket/back/models/ticket-methods.js
index 0ae2ce3b4..5582dde5c 100644
--- a/modules/ticket/back/models/ticket-methods.js
+++ b/modules/ticket/back/models/ticket-methods.js
@@ -46,6 +46,5 @@ module.exports = function(Self) {
require('../methods/ticket/invoiceTicketsAndPdf')(Self);
require('../methods/ticket/docuwareDownload')(Self);
require('../methods/ticket/myLastModified')(Self);
- require('../methods/ticket/addSaleByCode')(Self);
require('../methods/ticket/clone')(Self);
};
diff --git a/modules/ticket/back/models/ticket-request.js b/modules/ticket/back/models/ticket-request.js
index 622cd7696..30d6a5454 100644
--- a/modules/ticket/back/models/ticket-request.js
+++ b/modules/ticket/back/models/ticket-request.js
@@ -19,7 +19,7 @@ module.exports = function(Self) {
instance.requesterFk = worker.id;
const httpCtx = {req: loopBackContext.active};
- const httpRequest = httpCtx.req.http .req;
+ const httpRequest = httpCtx.req.http.req;
const $t = httpRequest.__;
if (attenderFk) {
diff --git a/modules/ticket/back/models/ticket.json b/modules/ticket/back/models/ticket.json
index 248c0312f..d8a3206c6 100644
--- a/modules/ticket/back/models/ticket.json
+++ b/modules/ticket/back/models/ticket.json
@@ -77,6 +77,11 @@
"model": "Client",
"foreignKey": "clientFk"
},
+ "user": {
+ "type": "belongsTo",
+ "model": "VnUser",
+ "foreignKey": "clientFk"
+ },
"warehouse": {
"type": "belongsTo",
"model": "Warehouse",
@@ -147,6 +152,11 @@
"type": "belongsTo",
"model": "Cmr",
"foreignKey": "cmrFk"
+ },
+ "ticketCollections": {
+ "type": "hasMany",
+ "model": "TicketCollection",
+ "foreignKey": "ticketFk"
}
}
}
diff --git a/modules/ticket/front/card/index.js b/modules/ticket/front/card/index.js
index fa4ad4e39..34ab109c5 100644
--- a/modules/ticket/front/card/index.js
+++ b/modules/ticket/front/card/index.js
@@ -1,5 +1,6 @@
import ngModule from '../module';
import ModuleCard from 'salix/components/module-card';
+import UserError from 'core/lib/user-error';
class Controller extends ModuleCard {
reload() {
@@ -59,6 +60,10 @@ class Controller extends ModuleCard {
],
};
+ if (!this.$params.id) {
+ this.$state.go('ticket.index');
+ throw new UserError(`You must select a ticket`);
+ }
return this.$http.get(`Tickets/${this.$params.id}`, {filter})
.then(res => this.onData(res.data));
}
diff --git a/modules/ticket/front/component/index.html b/modules/ticket/front/component/index.html
index 39b54b461..2a3a80f3e 100644
--- a/modules/ticket/front/component/index.html
+++ b/modules/ticket/front/component/index.html
@@ -51,7 +51,7 @@
ng-repeat="saleComponent in sale.components track by saleComponent.componentFk"
class="components">
- {{::saleComponent.component.componentType.type}}
+ {{::saleComponent.component.componentType.name}}
{{::saleComponent.component.name}}
diff --git a/modules/ticket/front/component/index.js b/modules/ticket/front/component/index.js
index 3f262f457..aa755e808 100644
--- a/modules/ticket/front/component/index.js
+++ b/modules/ticket/front/component/index.js
@@ -20,7 +20,7 @@ class Controller extends Section {
include: {
relation: 'componentType',
scope: {
- fields: ['type', 'isBase']
+ fields: ['name', 'isBase']
}
}
}
diff --git a/modules/ticket/front/descriptor-menu/index.html b/modules/ticket/front/descriptor-menu/index.html
index cb7eeb8ee..3583b1202 100644
--- a/modules/ticket/front/descriptor-menu/index.html
+++ b/modules/ticket/front/descriptor-menu/index.html
@@ -152,7 +152,7 @@
diff --git a/modules/ticket/front/descriptor-menu/index.js b/modules/ticket/front/descriptor-menu/index.js
index 52cac141c..32f245454 100644
--- a/modules/ticket/front/descriptor-menu/index.js
+++ b/modules/ticket/front/descriptor-menu/index.js
@@ -37,18 +37,19 @@ class Controller extends Section {
});
const filter = {
- fields: ['originFk', 'creationDate', 'newInstance'],
+ fields: ['id', 'originFk', 'creationDate', 'newInstance'],
where: {
originFk: value,
newInstance: {like: '%"isDeleted":true%'}
},
- order: 'creationDate DESC'
+ order: 'creationDate DESC',
+ limit: 1
};
- this.$http.get(`TicketLogs/findOne`, {filter})
+ this.$http.get(`TicketLogs`, {filter})
.then(res => {
- if (res && res.data) {
+ if (res && res.data && res.data.length) {
const now = Date.vnNew();
- const maxDate = new Date(res.data.creationDate);
+ const maxDate = new Date(res.data[0].creationDate);
maxDate.setHours(maxDate.getHours() + 1);
if (now <= maxDate)
return this.canRestoreTicket = true;
diff --git a/modules/ticket/front/locale/es.yml b/modules/ticket/front/locale/es.yml
index 748ba210f..2f448c034 100644
--- a/modules/ticket/front/locale/es.yml
+++ b/modules/ticket/front/locale/es.yml
@@ -64,6 +64,7 @@ You are going to delete this ticket: Vas a eliminar este ticket
Ticket deleted. You can undo this action within the first hour: Ticket eliminado. Puedes deshacer esta acción durante la primera hora
Search ticket by id or alias: Buscar tickets por identificador o alias
ticket: ticket
+You must select a ticket: Debes seleccionar un ticket
#sections
List: Listado
diff --git a/modules/ticket/front/sale/index.js b/modules/ticket/front/sale/index.js
index 1cd5560a4..7ff8d89e3 100644
--- a/modules/ticket/front/sale/index.js
+++ b/modules/ticket/front/sale/index.js
@@ -476,7 +476,7 @@ class Controller extends Section {
*/
addSale(sale) {
const data = {
- itemId: sale.itemFk,
+ barcode: sale.itemFk,
quantity: sale.quantity
};
const query = `tickets/${this.ticket.id}/addSale`;
diff --git a/modules/ticket/front/sale/index.spec.js b/modules/ticket/front/sale/index.spec.js
index fb1c925d4..8200d6b89 100644
--- a/modules/ticket/front/sale/index.spec.js
+++ b/modules/ticket/front/sale/index.spec.js
@@ -659,7 +659,7 @@ describe('Ticket', () => {
jest.spyOn(controller, 'resetChanges').mockReturnThis();
const newSale = {itemFk: 4, quantity: 10};
- const expectedParams = {itemId: 4, quantity: 10};
+ const expectedParams = {barcode: 4, quantity: 10};
const expectedResult = {
id: 30,
quantity: 10,
diff --git a/modules/travel/back/methods/thermograph/specs/createThermograph.spec.js b/modules/travel/back/methods/thermograph/specs/createThermograph.spec.js
index 90855bf81..71b9fcccb 100644
--- a/modules/travel/back/methods/thermograph/specs/createThermograph.spec.js
+++ b/modules/travel/back/methods/thermograph/specs/createThermograph.spec.js
@@ -5,7 +5,7 @@ describe('Termograph createThermograph()', () => {
const model = 'DISPOSABLE';
const temperatureFk = 'COOL';
const warehouseId = 1;
- const ctx = {req: {accessToken: {userId: 9}}};
+ const ctx = beforeAll.getCtx();
it(`should create a thermograph which is saved in both thermograph and travelThermograph`, async() => {
const tx = await models.Thermograph.beginTransaction({});
diff --git a/modules/travel/back/methods/travel/cloneWithEntries.js b/modules/travel/back/methods/travel/cloneWithEntries.js
index e5eb0b06c..12afad6e2 100644
--- a/modules/travel/back/methods/travel/cloneWithEntries.js
+++ b/modules/travel/back/methods/travel/cloneWithEntries.js
@@ -26,18 +26,17 @@ module.exports = Self => {
Self.cloneWithEntries = async(ctx, id, options) => {
const conn = Self.dataSource.connector;
+ let tx;
const myOptions = {};
- let tx = options?.transaction;
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
+
+ if (!myOptions.transaction) {
+ tx = await Self.beginTransaction({});
+ myOptions.transaction = tx;
+ }
try {
- if (typeof options == 'object')
- Object.assign(myOptions, options);
-
- if (!myOptions.transaction) {
- tx = await Self.beginTransaction({});
- myOptions.transaction = tx;
- }
-
const travel = await Self.findById(id, {
fields: [
'id',
@@ -89,6 +88,8 @@ module.exports = Self => {
'ref'
]
}, myOptions);
+
+ if (tx) await tx.commit();
return newTravel.id;
} catch (e) {
if (tx) await tx.rollback();
diff --git a/modules/travel/back/methods/travel/extraCommunityFilter.js b/modules/travel/back/methods/travel/extraCommunityFilter.js
index 488297318..dcb704ff5 100644
--- a/modules/travel/back/methods/travel/extraCommunityFilter.js
+++ b/modules/travel/back/methods/travel/extraCommunityFilter.js
@@ -138,7 +138,19 @@ module.exports = Self => {
b.stickers *
IF(pkg.volume, pkg.volume, pkg.width * pkg.depth * pkg.height) / 1000000
) as DECIMAL(10,0)
- ) as volumeKg
+ ) as volumeKg,
+ GREATEST(
+ CAST(SUM(b.weight * b.stickers) AS INT),
+ CAST(
+ SUM(vc.aerealVolumetricDensity *
+ b.stickers *
+ IF(pkg.volume,
+ pkg.volume,
+ pkg.width * pkg.depth * pkg.height
+ ) / 1000000
+ ) AS INT
+ )
+ / t.kg * 100, 0) percentageKg
FROM travel t
LEFT JOIN supplier s ON s.id = t.cargoSupplierFk
LEFT JOIN entry e ON e.travelFk = t.id
diff --git a/modules/travel/back/methods/travel/specs/cloneWithEntries.spec.js b/modules/travel/back/methods/travel/specs/cloneWithEntries.spec.js
index 950da7bb1..8b3638db9 100644
--- a/modules/travel/back/methods/travel/specs/cloneWithEntries.spec.js
+++ b/modules/travel/back/methods/travel/specs/cloneWithEntries.spec.js
@@ -7,19 +7,22 @@ describe('Travel cloneWithEntries()', () => {
const ctx = {req: {accessToken: {userId: currentUserId}}};
let newTravelId;
it(`should clone the travel and the containing entries`, async() => {
- const tx = await models.Travel.beginTransaction({
- });
+ const tx = await models.Travel.beginTransaction({});
const warehouseThree = 3;
const agencyModeOne = 1;
+ let travelRemoved;
+
try {
const options = {transaction: tx};
+
newTravelId = await models.Travel.cloneWithEntries(ctx, travelId, options);
const travelEntries = await models.Entry.find({
where: {
travelFk: newTravelId
}
}, options);
- const newTravel = await models.Travel.findById(travelId);
+ const newTravel = await models.Travel.findById(travelId, null, options);
+ travelRemoved = await models.Travel.findById(newTravelId);
expect(newTravelId).not.toEqual(travelId);
expect(newTravel.ref).toEqual('fifth travel');
@@ -27,14 +30,9 @@ describe('Travel cloneWithEntries()', () => {
expect(newTravel.warehouseOutFk).toEqual(warehouseThree);
expect(newTravel.agencyModeFk).toEqual(agencyModeOne);
expect(travelEntries.length).toBeGreaterThan(0);
- await models.Entry.destroyAll({
- travelFk: newTravelId
- }, options);
- await models.Travel.destroyById(newTravelId, options);
- await tx.rollback();
- const travelRemoved = await models.Travel.findById(newTravelId, options);
-
expect(travelRemoved).toBeNull();
+
+ await tx.rollback();
} catch (e) {
if (tx) await tx.rollback();
throw e;
diff --git a/modules/travel/back/methods/travel/specs/createThermograph.spec.js b/modules/travel/back/methods/travel/specs/createThermograph.spec.js
index e812eae70..f70e27368 100644
--- a/modules/travel/back/methods/travel/specs/createThermograph.spec.js
+++ b/modules/travel/back/methods/travel/specs/createThermograph.spec.js
@@ -1,20 +1,7 @@
const models = require('vn-loopback/server/server').models;
-const LoopBackContext = require('loopback-context');
describe('Travel createThermograph()', () => {
- beforeAll(async() => {
- const activeCtx = {
- accessToken: {userId: 9},
- http: {
- req: {
- headers: {origin: 'http://localhost'}
- }
- }
- };
- spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
- active: activeCtx
- });
- });
+ beforeAll.mockLoopBackContext();
const travelId = 3;
const currentUserId = 1102;
const thermographId = '138350-0';
diff --git a/modules/travel/back/model-config.json b/modules/travel/back/model-config.json
index ed5c071b3..952ce0d20 100644
--- a/modules/travel/back/model-config.json
+++ b/modules/travel/back/model-config.json
@@ -11,6 +11,9 @@
"Thermograph": {
"dataSource": "vn"
},
+ "TravelKgPercentage": {
+ "dataSource": "vn"
+ },
"TravelThermograph": {
"dataSource": "vn"
},
@@ -20,4 +23,4 @@
"Temperature": {
"dataSource": "vn"
}
-}
+}
\ No newline at end of file
diff --git a/modules/travel/back/models/travel-kg-percentage.json b/modules/travel/back/models/travel-kg-percentage.json
new file mode 100644
index 000000000..e99a88999
--- /dev/null
+++ b/modules/travel/back/models/travel-kg-percentage.json
@@ -0,0 +1,21 @@
+{
+ "name": "TravelKgPercentage",
+ "base": "VnModel",
+ "mixins": {
+ "Loggable": true
+ },
+ "options": {
+ "mysql": {
+ "table": "travelKgPercentage"
+ }
+ },
+ "properties": {
+ "value": {
+ "type": "number",
+ "id": true
+ },
+ "className": {
+ "type": "string"
+ }
+ }
+}
\ No newline at end of file
diff --git a/modules/travel/front/descriptor-menu/index.html b/modules/travel/front/descriptor-menu/index.html
index 9b408994f..19831860b 100644
--- a/modules/travel/front/descriptor-menu/index.html
+++ b/modules/travel/front/descriptor-menu/index.html
@@ -26,8 +26,8 @@
Delete travel
Add entry
@@ -35,7 +35,7 @@
-
-
- this.$state.go('travel.card.basicData', {id: res.data}));
diff --git a/modules/travel/front/routes.json b/modules/travel/front/routes.json
index b2e438c6d..5a63620d4 100644
--- a/modules/travel/front/routes.json
+++ b/modules/travel/front/routes.json
@@ -3,7 +3,7 @@
"name": "Travels",
"icon": "local_airport",
"validations": true,
- "dependencies": ["worker", "entry"],
+ "dependencies": ["worker"],
"menus": {
"main": [
{"state": "travel.index", "icon": "local_airport"},
@@ -45,7 +45,7 @@
"state": "travel.card.basicData",
"component": "vn-travel-basic-data",
"description": "Basic data",
- "acl": ["buyer","logistic"],
+ "acl": ["buyer","logistic"],
"params": {
"travel": "$ctrl.travel"
}
@@ -97,10 +97,10 @@
"state": "travel.extraCommunity",
"component": "vn-travel-extra-community",
"description": "Extra community",
- "acl": ["buyer"],
+ "acl": ["buyer"],
"params": {
"travel": "$ctrl.travel"
}
}
]
-}
\ No newline at end of file
+}
diff --git a/modules/worker/back/methods/calendar/specs/absences.spec.js b/modules/worker/back/methods/calendar/specs/absences.spec.js
index b27c9549c..f369d1dca 100644
--- a/modules/worker/back/methods/calendar/specs/absences.spec.js
+++ b/modules/worker/back/methods/calendar/specs/absences.spec.js
@@ -1,6 +1,7 @@
const app = require('vn-loopback/server/server');
describe('Worker absences()', () => {
+ const ctx = beforeAll.getCtx();
it('should get the absence calendar for a full year contract', async() => {
const ctx = {req: {accessToken: {userId: 1106}}};
const workerId = 1106;
@@ -20,7 +21,6 @@ describe('Worker absences()', () => {
it('should get the absence calendar for a permanent contract', async() => {
const businessId = 1106;
- const ctx = {req: {accessToken: {userId: 9}}};
const now = Date.vnNew();
const year = now.getFullYear();
diff --git a/modules/worker/back/methods/department/specs/getLeaves.spec.js b/modules/worker/back/methods/department/specs/getLeaves.spec.js
index fb7c84ff4..2feb6b461 100644
--- a/modules/worker/back/methods/department/specs/getLeaves.spec.js
+++ b/modules/worker/back/methods/department/specs/getLeaves.spec.js
@@ -1,7 +1,7 @@
const models = require('vn-loopback/server/server').models;
describe('department getLeaves()', () => {
- const ctx = {req: {accessToken: {userId: 9}}};
+ const ctx = beforeAll.getCtx();
it('should return the department and the childs containing the search value', async() => {
let result = await models.Department.getLeaves(ctx, null, 'INFORMATICA');
diff --git a/modules/worker/back/methods/worker-time-control/getMailStates.js b/modules/worker/back/methods/worker-time-control/getMailStates.js
index 855b5adc3..d55c185a5 100644
--- a/modules/worker/back/methods/worker-time-control/getMailStates.js
+++ b/modules/worker/back/methods/worker-time-control/getMailStates.js
@@ -1,3 +1,5 @@
+const UserError = require('vn-loopback/util/user-error');
+
module.exports = Self => {
Self.remoteMethodCtx('getMailStates', {
description: 'Get the states of a month about time control mail',
@@ -36,6 +38,8 @@ module.exports = Self => {
if (typeof options == 'object')
Object.assign(myOptions, options);
+ if (!await models.Worker.isSubordinate(ctx, workerId)) throw new UserError(`You don't have enough privileges`);
+
const times = await models.Time.find({
fields: ['week'],
where: {
diff --git a/modules/worker/back/methods/worker-time-control/resendWeeklyHourEmail.js b/modules/worker/back/methods/worker-time-control/resendWeeklyHourEmail.js
index 885637118..ed6b4e6ab 100644
--- a/modules/worker/back/methods/worker-time-control/resendWeeklyHourEmail.js
+++ b/modules/worker/back/methods/worker-time-control/resendWeeklyHourEmail.js
@@ -1,4 +1,5 @@
const moment = require('moment');
+const UserError = require('vn-loopback/util/user-error');
module.exports = Self => {
Self.remoteMethodCtx('resendWeeklyHourEmail', {
@@ -34,6 +35,11 @@ module.exports = Self => {
const yearNumber = dated.getFullYear();
const weekNumber = moment(dated).isoWeek();
+ const isSubordinate = await models.Worker.isSubordinate(ctx, workerId, myOptions);
+ const isTeamBoss = await models.ACL.checkAccessAcl(ctx, 'Worker', 'isTeamBoss', 'WRITE');
+
+ if (!isSubordinate || (workerId === ctx.req.accessToken.userId && !isTeamBoss))
+ throw new UserError(`You don't have enough privileges`);
const workerTimeControlMail = await models.WorkerTimeControlMail.findOne({
where: {
diff --git a/modules/worker/back/methods/worker-time-control/specs/getMailStates.spec.js b/modules/worker/back/methods/worker-time-control/specs/getMailStates.spec.js
index cbad32323..083236ec6 100644
--- a/modules/worker/back/methods/worker-time-control/specs/getMailStates.spec.js
+++ b/modules/worker/back/methods/worker-time-control/specs/getMailStates.spec.js
@@ -1,28 +1,36 @@
const models = require('vn-loopback/server/server').models;
describe('workerTimeControl getMailStates()', () => {
- const workerId = 9;
- const ctx = {args: {
- month: 12,
- year: 2000
- }};
+ const developerId = 9;
+ const developerBossId = 120;
+ const employeeId = 1;
+
+ let ctx;
+ let tx;
+ let opts;
+
+ beforeEach(async() => {
+ ctx = {req: {accessToken: {userId: developerBossId}}, args: {month: 12, year: 2000}};
+ tx = await models.WorkerTimeControl.beginTransaction({});
+ opts = {transaction: tx};
+ });
+
+ afterEach(async() => await tx.rollback());
it('should get the states of a month about time control mail', async() => {
- const tx = await models.WorkerTimeControl.beginTransaction({});
+ const response = await models.WorkerTimeControl.getMailStates(ctx, developerId, opts);
+ expect(response[0].state).toEqual('REVISE');
+ expect(response[1].state).toEqual('SENDED');
+ expect(response[2].state).toEqual('CONFIRMED');
+ });
+
+ it('should throw an error if they are not subordinates', async() => {
+ ctx.req.accessToken.userId = employeeId;
try {
- const options = {transaction: tx};
-
- const response = await models.WorkerTimeControl.getMailStates(ctx, workerId, options);
-
- expect(response[0].state).toEqual('REVISE');
- expect(response[1].state).toEqual('SENDED');
- expect(response[2].state).toEqual('CONFIRMED');
-
- await tx.rollback();
+ await models.WorkerTimeControl.getMailStates(ctx, developerId, opts);
} catch (e) {
- await tx.rollback();
- throw e;
+ expect(e.message).toEqual('You don\'t have enough privileges');
}
});
});
diff --git a/modules/worker/back/methods/worker-time-control/specs/updateWorkerTimeControlMail.spec.js b/modules/worker/back/methods/worker-time-control/specs/updateMailState.spec.js
similarity index 82%
rename from modules/worker/back/methods/worker-time-control/specs/updateWorkerTimeControlMail.spec.js
rename to modules/worker/back/methods/worker-time-control/specs/updateMailState.spec.js
index 3b5b2b73f..151b6ca94 100644
--- a/modules/worker/back/methods/worker-time-control/specs/updateWorkerTimeControlMail.spec.js
+++ b/modules/worker/back/methods/worker-time-control/specs/updateMailState.spec.js
@@ -1,10 +1,11 @@
const models = require('vn-loopback/server/server').models;
-describe('updateWorkerTimeControlMail()', () => {
+describe('updateMailState()', () => {
+ const developerId = 9;
+ const employeeId = 1;
it('should update WorkerTimeControlMail if exist record', async() => {
const tx = await models.WorkerTimeControlMail.beginTransaction({});
const args = {
- workerId: 9,
week: 50,
year: 2000,
state: 'CONFIRMED'
@@ -15,15 +16,15 @@ describe('updateWorkerTimeControlMail()', () => {
const options = {transaction: tx};
const beforeMail = await models.WorkerTimeControlMail.findOne({
where: {
- workerFk: args.workerId,
+ workerFk: developerId,
year: args.year,
week: args.week,
}
}, options);
- await models.WorkerTimeControl.updateWorkerTimeControlMail(ctx, options);
+ await models.WorkerTimeControl.updateMailState(ctx, developerId, options);
const afterMail = await models.WorkerTimeControlMail.findOne({
where: {
- workerFk: args.workerId,
+ workerFk: developerId,
year: args.year,
week: args.week,
}
@@ -42,7 +43,6 @@ describe('updateWorkerTimeControlMail()', () => {
it('should insert WorkerTimeControlMail if exist record', async() => {
const tx = await models.WorkerTimeControlMail.beginTransaction({});
const args = {
- workerId: 1,
week: 51,
year: 2000,
state: 'SENDED'
@@ -53,15 +53,15 @@ describe('updateWorkerTimeControlMail()', () => {
const options = {transaction: tx};
const beforeMail = await models.WorkerTimeControlMail.find({
where: {
- workerFk: args.workerId,
+ workerFk: employeeId,
year: args.year,
week: args.week,
}
}, options);
- await models.WorkerTimeControl.updateWorkerTimeControlMail(ctx, options);
+ await models.WorkerTimeControl.updateMailState(ctx, employeeId, options);
const afterMail = await models.WorkerTimeControlMail.find({
where: {
- workerFk: args.workerId,
+ workerFk: employeeId,
year: args.year,
week: args.week,
}
@@ -80,7 +80,7 @@ describe('updateWorkerTimeControlMail()', () => {
it('should throw error if not exist any record in this week', async() => {
const tx = await models.WorkerTimeControlMail.beginTransaction({});
const ctx = {args: {
- workerId: 1,
+ workerId: employeeId,
week: 1,
year: 0,
state: 'SENDED'
@@ -89,7 +89,7 @@ describe('updateWorkerTimeControlMail()', () => {
let error;
try {
const options = {transaction: tx};
- await models.WorkerTimeControl.updateWorkerTimeControlMail(ctx, options);
+ await models.WorkerTimeControl.updateMailState(ctx, employeeId, options);
await tx.rollback();
} catch (e) {
diff --git a/modules/worker/back/methods/worker-time-control/updateWorkerTimeControlMail.js b/modules/worker/back/methods/worker-time-control/updateMailState.js
similarity index 84%
rename from modules/worker/back/methods/worker-time-control/updateWorkerTimeControlMail.js
rename to modules/worker/back/methods/worker-time-control/updateMailState.js
index 3594f05fe..c3bacaac0 100644
--- a/modules/worker/back/methods/worker-time-control/updateWorkerTimeControlMail.js
+++ b/modules/worker/back/methods/worker-time-control/updateMailState.js
@@ -1,12 +1,13 @@
const UserError = require('vn-loopback/util/user-error');
module.exports = Self => {
- Self.remoteMethodCtx('updateWorkerTimeControlMail', {
+ Self.remoteMethodCtx('updateMailState', {
description: 'Updates the state of WorkerTimeControlMail',
accessType: 'WRITE',
accepts: [{
- arg: 'workerId',
+ arg: 'id',
type: 'number',
- required: true
+ description: 'The worker id',
+ http: {source: 'path'}
},
{
arg: 'year',
@@ -32,12 +33,12 @@ module.exports = Self => {
root: true
},
http: {
- path: `/updateWorkerTimeControlMail`,
+ path: `/:id/updateMailState`,
verb: 'POST'
}
});
- Self.updateWorkerTimeControlMail = async(ctx, options) => {
+ Self.updateMailState = async(ctx, id, options) => {
const models = Self.app.models;
const args = ctx.args;
const myOptions = {};
@@ -59,14 +60,14 @@ module.exports = Self => {
{
year: args.year,
week: args.week,
- workerFk: args.workerId
+ workerFk: id
},
{
state: args.state,
- reason: args.workerId,
+ reason: args.reason,
year: args.year,
week: args.week,
- workerFk: args.workerId
+ workerFk: id
},
myOptions);
diff --git a/modules/worker/back/methods/worker-time-control/weeklyHourRecordEmail.js b/modules/worker/back/methods/worker-time-control/weeklyHourRecordEmail.js
index 816a1d22b..f19ab17e1 100644
--- a/modules/worker/back/methods/worker-time-control/weeklyHourRecordEmail.js
+++ b/modules/worker/back/methods/worker-time-control/weeklyHourRecordEmail.js
@@ -35,7 +35,7 @@ module.exports = Self => {
root: true
},
http: {
- path: '/weekly-hour-hecord-email',
+ path: '/weekly-hour-record-email',
verb: 'POST'
}
});
@@ -61,7 +61,7 @@ module.exports = Self => {
const url = `${salix.url}worker/${args.workerId}/time-control?timestamp=${timestamp}`;
ctx.args.url = url;
- await models.WorkerTimeControl.updateWorkerTimeControlMail(ctx, myOptions);
+ await models.WorkerTimeControl.updateMailState(ctx, ctx.workerId, myOptions);
return Self.sendTemplate(ctx, 'weekly-hour-record');
};
diff --git a/modules/worker/back/methods/worker/createAbsence.js b/modules/worker/back/methods/worker/createAbsence.js
index 2de1d6e4d..0397886cf 100644
--- a/modules/worker/back/methods/worker/createAbsence.js
+++ b/modules/worker/back/methods/worker/createAbsence.js
@@ -110,8 +110,7 @@ module.exports = Self => {
workCenterFk: workCenter.workCenterFk
}
});
-
- if (holiday && isFestive)
+ if ((holiday && isFestive) && (workCenter.workcenterFk === holiday.workCenterFk))
throw new UserError(`Cannot add holidays on this day`);
const absence = await models.Calendar.create({
diff --git a/modules/worker/back/methods/worker/getAvailablePda.js b/modules/worker/back/methods/worker/getAvailablePda.js
new file mode 100644
index 000000000..65641a9e6
--- /dev/null
+++ b/modules/worker/back/methods/worker/getAvailablePda.js
@@ -0,0 +1,23 @@
+module.exports = Self => {
+ Self.remoteMethod('getAvailablePda', {
+ description: 'returns devices without user',
+ accessType: 'READ',
+ accepts: [],
+ returns: {
+ type: 'array',
+ root: true
+ },
+ http: {
+ path: `/getAvailablePda`,
+ verb: 'GET'
+ }
+ });
+ Self.getAvailablePda = async() => {
+ return Self.app.models.DeviceProduction.rawSql(
+ `SELECT d.*
+ FROM deviceProduction d
+ LEFT JOIN deviceProductionUser du ON du.deviceProductionFk = d.id
+ WHERE du.deviceProductionFk IS NULL`
+ );
+ };
+};
diff --git a/modules/worker/back/methods/worker/new.js b/modules/worker/back/methods/worker/new.js
index 5316daf01..ba9dc3853 100644
--- a/modules/worker/back/methods/worker/new.js
+++ b/modules/worker/back/methods/worker/new.js
@@ -5,108 +5,80 @@ module.exports = Self => {
Self.remoteMethodCtx('new', {
description: 'Creates a new worker and returns the id',
accessType: 'WRITE',
- accepts: [
- {
- arg: 'fi',
- type: 'string',
- description: `The worker fi`,
- required: true,
- },
- {
- arg: 'name',
- type: 'string',
- description: `The user name`,
- required: true,
- },
- {
- arg: 'firstName',
- type: 'string',
- description: `The worker firstname`,
- required: true,
- },
- {
- arg: 'lastNames',
- type: 'string',
- description: `The worker lastnames`,
- required: true,
- },
- {
- arg: 'email',
- type: 'string',
- description: `The worker email`,
- required: true,
- },
- {
- arg: 'street',
- type: 'string',
- description: `The worker address`,
- required: true,
- },
- {
- arg: 'city',
- type: 'string',
- description: `The worker city`,
- required: true,
- },
- {
- arg: 'provinceFk',
- type: 'number',
- description: `The worker province`,
- required: true,
- },
- {
- arg: 'companyFk',
- type: 'number',
- description: `The worker company`,
- required: true,
- },
- {
- arg: 'postcode',
- type: 'string',
- description: `The worker postcode`,
- required: true,
- },
- {
- arg: 'phone',
- type: 'string',
- description: `The worker phone`,
- required: true,
- },
- {
- arg: 'code',
- type: 'string',
- description: `The worker code`,
- required: true,
- },
- {
- arg: 'bossFk',
- type: 'number',
- description: `The worker boss`,
- required: true,
- },
- {
- arg: 'birth',
- type: 'date',
- description: `The worker birth`,
- required: true,
- },
- {
- arg: 'payMethodFk',
- type: 'number',
- description: `The client payMethod`,
- required: true,
- },
- {
- arg: 'iban',
- type: 'string',
- description: `The client iban`,
- },
- {
- arg: 'bankEntityFk',
- type: 'number',
- description: `The client bank entity`,
- }
- ],
+ accepts: [{
+ arg: 'fi',
+ type: 'string',
+ description: `The worker fi`,
+ }, {
+ arg: 'name',
+ type: 'string',
+ description: `The user name`,
+ }, {
+ arg: 'firstName',
+ type: 'string',
+ description: `The worker firstname`,
+ }, {
+ arg: 'lastNames',
+ type: 'string',
+ description: `The worker lastnames`,
+ }, {
+ arg: 'email',
+ type: 'string',
+ description: `The worker email`,
+ required: true,
+ }, {
+ arg: 'street',
+ type: 'string',
+ description: `The worker address`,
+ }, {
+ arg: 'city',
+ type: 'string',
+ description: `The worker city`,
+ }, {
+ arg: 'provinceFk',
+ type: 'number',
+ description: `The worker province`,
+ }, {
+ arg: 'companyFk',
+ type: 'number',
+ description: `The worker company`,
+ }, {
+ arg: 'postcode',
+ type: 'string',
+ description: `The worker postcode`,
+ }, {
+ arg: 'phone',
+ type: 'string',
+ description: `The worker phone`,
+ }, {
+ arg: 'code',
+ type: 'string',
+ description: `The worker code`,
+ }, {
+ arg: 'bossFk',
+ type: 'number',
+ description: `The worker boss`,
+ required: true,
+ }, {
+ arg: 'birth',
+ type: 'date',
+ description: `The worker birth`,
+ }, {
+ arg: 'payMethodFk',
+ type: 'number',
+ description: `The client payMethod`,
+ }, {
+ arg: 'iban',
+ type: 'string',
+ description: `The client iban`,
+ }, {
+ arg: 'bankEntityFk',
+ type: 'number',
+ description: `The client bank entity`,
+ }, {
+ arg: 'isFreelance',
+ type: 'boolean',
+ }],
returns: {
type: 'number',
root: true,
@@ -117,11 +89,30 @@ module.exports = Self => {
},
});
- Self.new = async(ctx, options) => {
+ Self.new = async(
+ ctx,
+ fi,
+ name,
+ firstName,
+ lastNames,
+ email,
+ street,
+ city,
+ provinceFk,
+ companyFk,
+ postcode,
+ phone,
+ code,
+ bossFk,
+ birth,
+ payMethodFk,
+ iban,
+ bankEntityFk,
+ isFreelance,
+ options
+ ) => {
const models = Self.app.models;
const myOptions = {userId: ctx.req.accessToken.userId};
- const args = ctx.args;
-
let tx;
if (typeof options == 'object') Object.assign(myOptions, options);
@@ -132,132 +123,105 @@ module.exports = Self => {
}
let client;
-
+ let user;
try {
- client = await models.Client.findOne(
- {
- where: {fi: args.fi},
- },
- myOptions
- );
+ client = await models.Client.findOne({where: {fi}}, myOptions);
+ const nickname = firstName.concat(' ', lastNames);
+ const {roleFk, businessTypeFk} = await models.WorkerConfig.findOne({fields: ['roleFk', 'businessTypeFk']});
- if (!client) {
- const nickname = args.firstName.concat(' ', args.lastNames);
- const workerConfig = await models.WorkerConfig.findOne({fields: ['roleFk', 'businessTypeFk']});
- const [randomPassword] = await models.Worker.rawSql(
- 'SELECT account.passwordGenerate() as password;'
- );
+ if (!isFreelance && !payMethodFk) throw new UserError('Payment method is required');
- const user = await models.VnUser.create(
- {
- name: args.name,
- nickname,
- password: randomPassword.password,
- email: args.email,
- roleFk: workerConfig.roleFk,
- },
- myOptions
- );
+ if (isFreelance || !client) {
+ const [{password}] = await models.Worker.rawSql('SELECT account.passwordGenerate() as password;');
+ const freelancer = isFreelance && await models.VnRole.findOne({fields: ['id'], where: {name: 'freelancer'}});
- await models.Account.create(
- {
- id: user.id,
- },
- myOptions
- );
+ user = await models.VnUser.create({
+ name,
+ nickname,
+ password,
+ email,
+ roleFk: freelancer ? freelancer.id : roleFk,
+ }, myOptions);
- const payMethod = await models.PayMethod.findById(args.payMethodFk, {fields: ['isIbanRequiredForClients']});
- if (payMethod.isIbanRequiredForClients && !args.iban)
- throw new UserError(`That payment method requires an IBAN`);
+ await models.Account.create({
+ id: user.id
+ }, myOptions);
+ } else if (client) user = await models.VnUser.findById(client.id, null, myOptions);
- await models.Worker.rawSql(
- 'CALL vn.client_create(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)',
+ if (!client && !isFreelance) {
+ const payMethod = await models.PayMethod.findById(payMethodFk, {fields: ['isIbanRequiredForClients']});
+ if (payMethod.isIbanRequiredForClients && !iban) throw new UserError('That payment method requires an IBAN');
+
+ await models.Worker.rawSql('CALL vn.client_create(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)',
[
- args.firstName,
- args.lastNames,
- args.fi,
- args.street,
- args.postcode,
- args.city,
- args.provinceFk,
- args.companyFk,
- args.phone,
- args.email,
+ firstName,
+ lastNames,
+ fi,
+ street,
+ postcode,
+ city,
+ provinceFk,
+ companyFk,
+ phone,
+ email,
user.id,
],
- myOptions
- );
+ myOptions);
- const address = await models.Address.create(
- {
- clientFk: user.id,
- street: args.street,
- city: args.city,
- provinceFk: args.provinceFk,
- postalCode: args.postcode,
- mobile: args.phone,
- nickname: nickname,
- isDefaultAddress: true,
- },
- myOptions
- );
+ const address = await models.Address.create({
+ clientFk: user.id,
+ street: street,
+ city: city,
+ provinceFk: provinceFk,
+ postalCode: postcode,
+ mobile: phone,
+ nickname: nickname,
+ isDefaultAddress: true,
+ }, myOptions);
- client = await models.Client.findById(
- user.id,
- {fields: ['id', 'name', 'socialName', 'street', 'city', 'iban', 'bankEntityFk', 'defaultAddressFk', 'businessTypeFk', 'fi']},
- myOptions
- );
+ client = await models.Client.findById(user.id, {
+ fields: ['id', 'name', 'socialName', 'street', 'city', 'iban', 'bankEntityFk', 'defaultAddressFk', 'businessTypeFk', 'fi']
+ }, myOptions);
- await client.updateAttributes(
- {
- payMethod: args.payMethod,
- iban: args.iban,
- bankEntityFk: args.bankEntityFk,
- defaultAddressFk: address.id,
- businessTypeFk: workerConfig.businessTypeFk,
- },
- myOptions
- );
+ await client.updateAttributes({
+ payMethod: payMethodFk,
+ iban,
+ bankEntityFk,
+ defaultAddressFk: address.id,
+ businessTypeFk,
+ }, myOptions);
}
- const user = await models.VnUser.findById(client.id, null, myOptions);
- await user.updateAttribute('email', args.email, myOptions);
+ await user.updateAttribute('email', email, myOptions);
await models.Worker.create({
- id: client.id,
- code: args.code,
- firstName: args.firstName,
- lastName: args.lastNames,
- bossFk: args.bossFk,
- fi: args.fi,
- birth: args.birth,
+ id: user.id,
+ firstName,
+ lastName: lastNames,
+ code,
+ bossFk,
+ fi,
+ birth,
}, myOptions);
if (tx) await tx.commit();
- } catch (error) {
+ } catch (e) {
if (tx) await tx.rollback();
- const code = error.code;
- const message = error.sqlMessage;
+ const code = e.code;
+ const message = e.sqlMessage;
- if (error.message && error.message.includes(`Email already exists`))
- throw new UserError(`This personal mail already exists`);
+ if (e.message && e.message.includes(`Email already exists`)) throw new UserError(`This personal mail already exists`);
- if (code === 'ER_DUP_ENTRY' && message.includes(`CodigoTrabajador_UNIQUE`))
- throw new UserError(`This worker code already exists`);
+ if (code === 'ER_DUP_ENTRY' && message.includes(`CodigoTrabajador_UNIQUE`)) throw new UserError(`This worker code already exists`);
- if (code === 'ER_DUP_ENTRY' && message.includes(`PRIMARY`))
- throw new UserError(`This worker already exists`);
+ if (code === 'ER_DUP_ENTRY' && message.includes(`PRIMARY`)) throw new UserError(`This worker already exists`);
- throw error;
+ throw e;
}
- await models.VnUser.resetPassword({
- email: args.email,
- emailTemplate: 'worker-welcome',
- id: client.id
- });
+ await models.VnUser.resetPassword({email, emailTemplate: 'worker-welcome', id: user.id});
- return {id: client.id};
+ return {id: user.id};
};
};
diff --git a/modules/worker/back/methods/worker/specs/createAbsence.spec.js b/modules/worker/back/methods/worker/specs/createAbsence.spec.js
index aadaca99b..fcb1c1633 100644
--- a/modules/worker/back/methods/worker/specs/createAbsence.spec.js
+++ b/modules/worker/back/methods/worker/specs/createAbsence.spec.js
@@ -133,7 +133,8 @@ describe('Worker createAbsence()', () => {
expect(error.message).toEqual(`Cannot add holidays on this day`);
});
- it(`should throw an error when adding a absence if the worker has hours recorded that day and not is a half absence`, async() => {
+ it(`should throw an error when adding a absence if the worker ` +
+ `has hours recorded that day and not is a half absence`, async() => {
const ctx = {
req: {accessToken: {userId: 19}},
args: {
diff --git a/modules/worker/back/methods/worker/specs/getAvailablePda.spec.js b/modules/worker/back/methods/worker/specs/getAvailablePda.spec.js
new file mode 100644
index 000000000..c7051f0b4
--- /dev/null
+++ b/modules/worker/back/methods/worker/specs/getAvailablePda.spec.js
@@ -0,0 +1,13 @@
+const models = require('vn-loopback/server/server').models;
+
+describe('worker getAvailablePda()', () => {
+ it('should return a Pda that has no user assigned', async() => {
+ const [{id}] = await models.Worker.getAvailablePda();
+
+ const deviceProductionUser = await models.DeviceProductionUser.findOne({
+ where: {deviceProductionFk: id}
+ });
+
+ expect(!deviceProductionUser).toBeTruthy();
+ });
+});
diff --git a/modules/worker/back/methods/worker/specs/mySubordinates.spec.js b/modules/worker/back/methods/worker/specs/mySubordinates.spec.js
index 7eb118d9c..7443827ce 100644
--- a/modules/worker/back/methods/worker/specs/mySubordinates.spec.js
+++ b/modules/worker/back/methods/worker/specs/mySubordinates.spec.js
@@ -1,8 +1,8 @@
const app = require('vn-loopback/server/server');
describe('worker mySubordinates()', () => {
+ const ctx = beforeAll.getCtx();
it('should return an array of subordinates greather than 1', async() => {
- let ctx = {req: {accessToken: {userId: 9}}};
let result = await app.models.Worker.mySubordinates(ctx);
expect(result.length).toBeGreaterThan(1);
diff --git a/modules/worker/back/methods/worker/specs/new.spec.js b/modules/worker/back/methods/worker/specs/new.spec.js
index 66959e0a7..d9e843064 100644
--- a/modules/worker/back/methods/worker/specs/new.spec.js
+++ b/modules/worker/back/methods/worker/specs/new.spec.js
@@ -1,189 +1,110 @@
-const models = require('vn-loopback/server/server').models;
-const LoopBackContext = require('loopback-context');
+const {models} = require('vn-loopback/server/server');
describe('Worker new', () => {
- beforeAll(async() => {
- const activeCtx = {
- accessToken: {userId: 9},
- http: {
- req: {
- headers: {origin: 'http://localhost'}
- }
- }
- };
-
- spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
- active: activeCtx
- });
- });
-
+ const developerId = 9;
const employeeId = 1;
- const defaultWorker = {
- fi: '78457139E',
- name: 'defaulterworker',
- firstName: 'DEFAULT',
- lastNames: 'WORKER',
- email: 'defaultWorker@mydomain.com',
- street: 'S/ DEFAULTWORKERSTREET',
- city: 'defaultWorkerCity',
- provinceFk: 1,
- companyFk: 442,
- postcode: '46680',
- phone: '123456789',
- code: 'DWW',
- bossFk: 9,
- birth: '2022-12-11T23:00:00.000Z',
- payMethodFk: 1,
- roleFk: 1
- };
+ const bruceWayneId = 1101;
+ const accessToken = {accessToken: {userId: developerId}};
+ const ctx = {req: accessToken};
+ let tx;
+ let opts;
- const req = {accessToken: {userId: 9}};
+ beforeAll.mockLoopBackContext();
- it('should return error if personal mail already exists', async() => {
- const user = await models.VnUser.findById(employeeId, {fields: ['email']});
-
- const tx = await models.Worker.beginTransaction({});
-
- let error;
- try {
- const options = {transaction: tx};
- const ctx = {
- args: Object.assign({}, defaultWorker, {email: user.email}),
- req
- };
-
- await models.Worker.new(ctx, options);
-
- await tx.rollback();
- } catch (e) {
- error = e;
- await tx.rollback();
- }
-
- expect(error.message).toEqual('This personal mail already exists');
- });
-
- it('should return error if worker code already exists', async() => {
- const worker = await models.Worker.findById(employeeId, {fields: ['code']});
-
- const tx = await models.Worker.beginTransaction({});
-
- let error;
- try {
- const options = {transaction: tx};
- const ctx = {
- args: Object.assign({}, defaultWorker, {code: worker.code}),
- req
- };
-
- await models.Worker.new(ctx, options);
-
- await tx.rollback();
- } catch (e) {
- error = e;
- await tx.rollback();
- }
-
- expect(error.message).toEqual('This worker code already exists');
- });
-
- it('should return error if worker already exists', async() => {
- const worker = await models.Client.findById(employeeId, {fields: ['fi']});
-
- const tx = await models.Worker.beginTransaction({});
-
- let error;
- try {
- const options = {transaction: tx};
- const ctx = {
- args: Object.assign({}, defaultWorker, {fi: worker.fi}),
- req
- };
- await models.Worker.new(ctx, options);
-
- await tx.rollback();
- } catch (e) {
- error = e;
- await tx.rollback();
- }
-
- expect(error.message).toEqual('This worker already exists');
- });
-
- it('should return error if payMethod require iban', async() => {
- const payMethodIbanRequired = await models.PayMethod.findOne({
- where: {
- isIbanRequiredForClients: true
- },
- fields: ['id']
+ describe('should return error', () => {
+ beforeEach(async() => {
+ tx = await models.Worker.beginTransaction({});
+ opts = {transaction: tx};
});
- const tx = await models.Worker.beginTransaction({});
+ afterEach(async() => await tx.rollback());
- let error;
- try {
- const options = {transaction: tx};
- const ctx = {
- args: Object.assign({}, defaultWorker, {payMethodFk: payMethodIbanRequired.id}),
- req
- };
- await models.Worker.new(ctx, options);
+ it('if personal mail already exists', async() => {
+ const user = await models.VnUser.findById(employeeId, {fields: ['email']});
+ try {
+ await createWorker(ctx, opts, {email: user.email});
+ } catch (e) {
+ expect(e.message).toEqual('This personal mail already exists');
+ }
+ });
- await tx.rollback();
- } catch (e) {
- error = e;
- await tx.rollback();
- }
+ it('if worker code already exists', async() => {
+ const worker = await models.Worker.findById(employeeId, {fields: ['code']});
+ try {
+ await createWorker(ctx, opts, {code: worker.code});
+ } catch (e) {
+ expect(e.message).toEqual('This worker code already exists');
+ }
+ });
- expect(error.message).toEqual('That payment method requires an IBAN');
+ it('if worker already exists', async() => {
+ const worker = await models.Client.findById(employeeId, {fields: ['fi']});
+ try {
+ await createWorker(ctx, opts, {fi: worker.fi});
+ } catch (e) {
+ expect(e.message).toEqual('This worker already exists');
+ }
+ });
+
+ it('if payMethod require iban', async() => {
+ const payMethodIbanRequired = await models.PayMethod.findOne({
+ fields: ['id'], where: {isIbanRequiredForClients: true}
+ });
+
+ try {
+ await createWorker(ctx, opts, {payMethodFk: payMethodIbanRequired.id});
+ } catch (e) {
+ expect(e.message).toEqual('That payment method requires an IBAN');
+ }
+ });
});
it('should create a new worker', async() => {
let newWorker;
try {
- newWorker = await models.Worker.new({args: defaultWorker, req});
+ newWorker = await createWorker(ctx);
+
+ expect(newWorker.id).toBeDefined();
} finally {
await removeWorker(newWorker.id);
}
-
- expect(newWorker.id).toBeDefined();
});
it('should create a new client', async() => {
let newWorker;
- let client;
try {
- newWorker = await models.Worker.new({args: defaultWorker, req});
- client = await models.Client.findById(newWorker.id);
+ newWorker = await createWorker(ctx);
+ let client = await models.Client.findById(newWorker.id);
+
+ expect(client).toBeDefined();
} finally {
await removeWorker(newWorker.id);
}
-
- expect(client).toBeDefined();
});
it('should create a new worker in client', async() => {
- const bruceWayneId = 1101;
const client = await models.Client.findById(bruceWayneId, {fields: ['fi', 'email']});
-
- const newWorkerData = {
- args: Object.assign(
- {},
- defaultWorker,
- {
- fi: client.fi,
- email: client.email
- }),
- req
- };
let newWorker;
try {
- newWorker = await models.Worker.new(newWorkerData);
+ newWorker = await createWorker(ctx, undefined, {fi: client.fi, email: client.email});
+
+ expect(newWorker.id).toEqual(bruceWayneId);
} finally {
await models.Worker.destroyById(newWorker.id);
}
+ });
- expect(newWorker.id).toEqual(bruceWayneId);
+ it('should create a new external worker', async() => {
+ let newWorker;
+ try {
+ newWorker = await createWorker(ctx, undefined, {isFreelance: true});
+ const client = await models.Client.findById(newWorker.id);
+
+ expect(newWorker.id).toBeDefined();
+ expect(client).toBeNull();
+ } finally {
+ await removeWorker(newWorker.id);
+ }
});
});
@@ -194,3 +115,28 @@ async function removeWorker(id) {
await models.Client.destroyById(id);
await models.VnUser.destroyById(id);
}
+
+async function createWorker(ctx, opts = undefined, params = {}) {
+ return models.Worker.new(
+ ctx,
+ params.fi ?? '78457139E',
+ params.name ?? 'defaulterworker',
+ params.firstName ?? 'DEFAULT',
+ params.lastNames ?? 'WORKER',
+ params.email ?? 'defaultWorker@mydomain.com',
+ params.street ?? 'S/ DEFAULTWORKERSTREET',
+ params.city ?? 'defaultWorkerCity',
+ params.provinceFk ?? 1,
+ params.companyFk ?? 442,
+ params.postcode ?? '46680',
+ params.phone ?? '123456789',
+ params.code ?? 'DWW',
+ params.bossFk ?? 9,
+ params.birth ?? '2022-12-11T23:00:00.000Z',
+ params.payMethodFk ?? 1,
+ undefined,
+ undefined,
+ params.isFreelance ?? false,
+ opts
+ );
+}
diff --git a/modules/worker/back/methods/worker/specs/setPassword.spec.js b/modules/worker/back/methods/worker/specs/setPassword.spec.js
index 8d152bdd1..b9b20ce94 100644
--- a/modules/worker/back/methods/worker/specs/setPassword.spec.js
+++ b/modules/worker/back/methods/worker/specs/setPassword.spec.js
@@ -42,7 +42,9 @@ describe('worker setPassword()', () => {
await tx.rollback();
} catch (e) {
- expect(e.message).toEqual(`This password can only be changed by the user themselves`);
+ expect(e.message).toEqual(
+ 'Through this procedure, it is not possible to modify the password of users with verified email'
+ );
await tx.rollback();
}
});
diff --git a/modules/worker/back/model-config.json b/modules/worker/back/model-config.json
index b7c355511..651228c04 100644
--- a/modules/worker/back/model-config.json
+++ b/modules/worker/back/model-config.json
@@ -124,6 +124,21 @@
},
"Locker": {
"dataSource": "vn"
+ },
+ "PayrollComponent": {
+ "dataSource": "vn"
+ },
+ "WorkerIncome": {
+ "dataSource": "vn"
+ },
+ "TrainingCourse": {
+ "dataSource": "vn"
+ },
+ "TrainingCourseType": {
+ "dataSource": "vn"
+ },
+ "TrainingCenter": {
+ "dataSource": "vn"
}
}
diff --git a/modules/worker/back/models/device-production-user.js b/modules/worker/back/models/device-production-user.js
new file mode 100644
index 000000000..8eead58e0
--- /dev/null
+++ b/modules/worker/back/models/device-production-user.js
@@ -0,0 +1,11 @@
+const UserError = require('vn-loopback/util/user-error');
+module.exports = Self => {
+ Self.rewriteDbError(function(err) {
+ if (err.code === 'ER_DUP_ENTRY')
+ return new UserError(`This PDA is already assigned to another user`);
+
+ if (err.code === 'ER_SIGNAL_EXCEPTION' && err.sqlMessage === 'You can only have one active PDA')
+ return new UserError(err.sqlMessage);
+ return err;
+ });
+};
diff --git a/modules/worker/back/models/device-production-user.json b/modules/worker/back/models/device-production-user.json
index 35a90fb50..a024cc94c 100644
--- a/modules/worker/back/models/device-production-user.json
+++ b/modules/worker/back/models/device-production-user.json
@@ -14,6 +14,10 @@
}
},
"properties": {
+ "id": {
+ "type": "number",
+ "id": true
+ },
"deviceProductionFk": {
"type": "number",
"id": true
@@ -21,6 +25,9 @@
"userFk": {
"type": "number"
},
+ "simSerialNumber": {
+ "type": "string"
+ },
"created": {
"type": "date"
}
@@ -28,7 +35,7 @@
"relations": {
"deviceProduction": {
"type": "belongsTo",
- "model": "DeviceProduction",
+ "model": "DeviceProduction",
"foreignKey": "deviceProductionFk"
},
"user": {
@@ -36,5 +43,10 @@
"model": "User",
"foreignKey": "userFk"
}
+ },
+ "scope": {
+ "include":{
+ "relation": "deviceProduction"
+ }
}
}
diff --git a/modules/worker/back/models/operator.js b/modules/worker/back/models/operator.js
index d46f3d934..70e20af5b 100644
--- a/modules/worker/back/models/operator.js
+++ b/modules/worker/back/models/operator.js
@@ -20,7 +20,7 @@ module.exports = Self => {
const notifications = await models.NotificationQueue.find(
{where: {created: {gte: new Date(Date.vnNow() - (backupPrinterNotificationDelay * 1000))},
notificationFk: notificationName,
- status: 'sent'
+ status: {neq: 'error'}
}
});
diff --git a/modules/worker/back/models/operator.json b/modules/worker/back/models/operator.json
index a2f3ee01c..d4832bccf 100644
--- a/modules/worker/back/models/operator.json
+++ b/modules/worker/back/models/operator.json
@@ -26,29 +26,33 @@
},
"labelerFk": {
"type": "number"
+ },
+ "isOnReservationMode": {
+ "type": "boolean",
+ "required": true
}
- },
+ },
"relations": {
- "sector": {
- "type": "belongsTo",
- "model": "Sector",
- "foreignKey": "sectorFk"
- },
+ "sector": {
+ "type": "belongsTo",
+ "model": "Sector",
+ "foreignKey": "sectorFk"
+ },
"train": {
- "type": "belongsTo",
- "model": "Train",
- "foreignKey": "trainFk"
- },
+ "type": "belongsTo",
+ "model": "Train",
+ "foreignKey": "trainFk"
+ },
"printer": {
- "type": "belongsTo",
- "model": "Printer",
- "foreignKey": "labelerFk"
- },
+ "type": "belongsTo",
+ "model": "Printer",
+ "foreignKey": "labelerFk"
+ },
"itemPackingType": {
- "type": "belongsTo",
- "model": "ItemPackingType",
- "foreignKey": "itemPackingTypeFk",
+ "type": "belongsTo",
+ "model": "ItemPackingType",
+ "foreignKey": "itemPackingTypeFk",
"primaryKey": "code"
- }
- }
-}
+ }
+ }
+}
\ No newline at end of file
diff --git a/modules/worker/back/models/payroll-component.json b/modules/worker/back/models/payroll-component.json
new file mode 100644
index 000000000..92b6c3835
--- /dev/null
+++ b/modules/worker/back/models/payroll-component.json
@@ -0,0 +1,27 @@
+{
+ "name": "PayrollComponent",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "payrollComponent"
+ }
+ },
+ "properties": {
+ "id": {
+ "id": true,
+ "type": "number"
+ },
+ "name": {
+ "type": "string"
+ },
+ "isSalaryAgreed": {
+ "type": "number"
+ },
+ "isVariable": {
+ "type": "number"
+ },
+ "isException": {
+ "type": "number"
+ }
+ }
+}
diff --git a/modules/worker/back/models/specs/locker.spec.js b/modules/worker/back/models/specs/locker.spec.js
index 32abb830e..96fca2405 100644
--- a/modules/worker/back/models/specs/locker.spec.js
+++ b/modules/worker/back/models/specs/locker.spec.js
@@ -6,8 +6,9 @@ describe('locker model ', () => {
const hrId = 37;
const jessicaJonesId = 1110;
const bruceBannerId = 1109;
- const lockerMaleId = 1;
- const lockerFemaleId = 147;
+ const lockerMaleId = 3;
+ const lockerFemaleId = 5;
+ const lockerNewFemaleId = 6;
let ctx;
let options;
let tx;
@@ -46,11 +47,13 @@ describe('locker model ', () => {
});
it('should change a locker', async() => {
- const locker = await models.Locker.findById(148, null, options);
- await locker.updateAttributes({workerFk: jessicaJonesId}, options);
const oldLocker = await models.Locker.findById(lockerFemaleId, null, options);
+ const locker = await models.Locker.findById(lockerNewFemaleId, null, options);
+ await locker.updateAttributes({workerFk: jessicaJonesId}, options);
+ const oldNowLocker = await models.Locker.findById(lockerFemaleId, null, options);
+ expect(oldLocker.workerFk).toEqual(jessicaJonesId);
expect(locker.workerFk).toEqual(jessicaJonesId);
- expect(oldLocker.workerFk).toEqual(null);
+ expect(oldNowLocker.workerFk).toEqual(null);
});
});
diff --git a/modules/worker/back/models/trainingCenter.json b/modules/worker/back/models/trainingCenter.json
new file mode 100644
index 000000000..8c5e47873
--- /dev/null
+++ b/modules/worker/back/models/trainingCenter.json
@@ -0,0 +1,21 @@
+{
+ "name": "TrainingCenter",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "trainingCenter"
+ }
+ },
+ "properties": {
+ "id": {
+ "type": "number",
+ "id": true,
+ "description": "Identifier"
+ },
+ "name": {
+ "type": "string",
+ "required": true
+ }
+
+ }
+}
diff --git a/modules/worker/back/models/trainingCourse.json b/modules/worker/back/models/trainingCourse.json
new file mode 100644
index 000000000..af466e13e
--- /dev/null
+++ b/modules/worker/back/models/trainingCourse.json
@@ -0,0 +1,66 @@
+{
+ "name": "TrainingCourse",
+ "description": "List of workers who have completed training",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "trainingCourse"
+ }
+ },
+ "properties": {
+ "id": {
+ "type": "number",
+ "id": true,
+ "description": "Identifier"
+ },
+ "workerFk": {
+ "type": "number",
+ "required": true
+ },
+ "trainingCourseTypeFk": {
+ "type": "number",
+ "required": true
+ },
+ "centerFk": {
+ "type" : "number"
+ },
+ "started": {
+ "type" : "date"
+ },
+ "ended": {
+ "type" : "date"
+ },
+ "invoice": {
+ "type" : "string"
+ },
+ "amount": {
+ "type" : "number"
+ },
+ "remark": {
+ "type" : "boolean"
+ },
+ "hasDiscount": {
+ "type" : "boolean"
+ },
+ "hasDiploma": {
+ "type" : "boolean"
+ }
+ },
+ "relations": {
+ "worker": {
+ "type": "belongsTo",
+ "model": "Worker",
+ "foreignKey": "workerFk"
+ },
+ "trainingCourseType": {
+ "type": "belongsTo",
+ "model": "TrainingCourseType",
+ "foreignKey": "trainingCourseTypeFk"
+ },
+ "trainingCenter": {
+ "type": "belongsTo",
+ "model": "TrainingCenter",
+ "foreignKey": "centerFk"
+ }
+ }
+}
diff --git a/modules/worker/back/models/trainingCourseType.json b/modules/worker/back/models/trainingCourseType.json
new file mode 100644
index 000000000..9bf8fc671
--- /dev/null
+++ b/modules/worker/back/models/trainingCourseType.json
@@ -0,0 +1,21 @@
+{
+ "name": "TrainingCourseType",
+ "description": "List of trainings",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "trainingCourseType"
+ }
+ },
+ "properties": {
+ "id": {
+ "type": "number",
+ "id": true,
+ "description": "Identifier"
+ },
+ "name": {
+ "type": "string",
+ "required": true
+ }
+ }
+}
diff --git a/modules/worker/back/models/worker-income.json b/modules/worker/back/models/worker-income.json
new file mode 100644
index 000000000..3a7f3407a
--- /dev/null
+++ b/modules/worker/back/models/worker-income.json
@@ -0,0 +1,45 @@
+{
+ "name": "WorkerIncome",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "workerIncome"
+ }
+ },
+ "properties": {
+ "id": {
+ "id": true,
+ "type": "number"
+ },
+ "debit": {
+ "type": "number"
+ },
+ "credit": {
+ "type": "number"
+ },
+ "incomeTypeFk": {
+ "type": "number"
+ },
+ "paymentDate": {
+ "type": "date"
+ },
+ "workerFk": {
+ "type": "number"
+ },
+ "concept": {
+ "type": "string"
+ }
+ },
+ "relations": {
+ "payrollComponent": {
+ "type": "belongsTo",
+ "model": "PayrollComponent",
+ "foreignKey": "id"
+ },
+ "worker": {
+ "type": "belongsTo",
+ "model": "Worker",
+ "foreignKey": "workerFk"
+ }
+ }
+}
diff --git a/modules/worker/back/models/worker-time-control.js b/modules/worker/back/models/worker-time-control.js
index 1457c7a46..92f1bacf0 100644
--- a/modules/worker/back/models/worker-time-control.js
+++ b/modules/worker/back/models/worker-time-control.js
@@ -6,7 +6,7 @@ module.exports = Self => {
require('../methods/worker-time-control/deleteTimeEntry')(Self);
require('../methods/worker-time-control/updateTimeEntry')(Self);
require('../methods/worker-time-control/sendMail')(Self);
- require('../methods/worker-time-control/updateWorkerTimeControlMail')(Self);
+ require('../methods/worker-time-control/updateMailState')(Self);
require('../methods/worker-time-control/weeklyHourRecordEmail')(Self);
require('../methods/worker-time-control/getMailStates')(Self);
require('../methods/worker-time-control/resendWeeklyHourEmail')(Self);
diff --git a/modules/worker/back/models/worker-time-control.json b/modules/worker/back/models/worker-time-control.json
index e2b74875a..3d408c18f 100644
--- a/modules/worker/back/models/worker-time-control.json
+++ b/modules/worker/back/models/worker-time-control.json
@@ -36,15 +36,24 @@
"model": "VnUser",
"foreignKey": "userFk"
},
- "worker": {
- "type": "hasOne",
- "model": "Worker",
- "foreignKey": "id"
+ "worker": {
+ "type": "hasOne",
+ "model": "Worker",
+ "foreignKey": "id"
},
"warehouse": {
"type": "belongsTo",
"model": "Warehouse",
"foreignKey": "warehouseFk"
}
- }
-}
+ },
+ "acls": [
+ {
+ "property": "updateMailState",
+ "accessType": "WRITE",
+ "permission": "ALLOW",
+ "principalType": "ROLE",
+ "principalId": "$owner"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/modules/worker/back/models/worker.js b/modules/worker/back/models/worker.js
index 076f2eaab..0b0e043f2 100644
--- a/modules/worker/back/models/worker.js
+++ b/modules/worker/back/models/worker.js
@@ -20,6 +20,7 @@ module.exports = Self => {
require('../methods/worker/search')(Self);
require('../methods/worker/isAuthorized')(Self);
require('../methods/worker/setPassword')(Self);
+ require('../methods/worker/getAvailablePda')(Self);
Self.validateAsync('fi', tinIsValid, {
message: 'Invalid TIN'
diff --git a/modules/worker/back/models/worker.json b/modules/worker/back/models/worker.json
index adfe2c58e..2c749144b 100644
--- a/modules/worker/back/models/worker.json
+++ b/modules/worker/back/models/worker.json
@@ -25,43 +25,59 @@
"required": true
},
"phone": {
- "type" : "string"
+ "type": "string"
},
"bossFk": {
- "type" : "number"
+ "type": "number"
},
"maritalStatus": {
- "type" : "string"
+ "type": "string"
},
"originCountryFk": {
- "type" : "number"
+ "type": "number"
},
"educationLevelFk": {
- "type" : "number"
+ "type": "number"
},
"SSN": {
- "type" : "string"
+ "type": "string"
},
"mobileExtension": {
- "type" : "number"
+ "type": "number"
},
"code": {
- "type" : "string"
+ "type": "string",
+ "required": true
},
"fi": {
- "type" : "string"
+ "type": "string"
},
"birth": {
- "type" : "date"
+ "type": "date"
},
"isF11Allowed": {
- "type" : "boolean"
+ "type": "boolean"
},
"sex": {
- "type" : "string"
+ "type": "string"
},
"isFreelance": {
- "type" : "boolean"
+ "type": "boolean"
+ },
+ "fiDueDate": {
+ "type": "date"
+ },
+ "hasMachineryAuthorized": {
+ "type": "boolean"
+ },
+ "seniority": {
+ "type": "date"
+ },
+ "isDisable": {
+ "type": "boolean"
+ },
+ "isSsDiscounted": {
+ "type": "boolean"
}
},
"relations": {
@@ -99,9 +115,19 @@
"type": "hasMany",
"model": "Locker",
"foreignKey": "workerFk"
+ },
+ "incomes": {
+ "type": "hasMany",
+ "model": "WorkerIncome",
+ "foreignKey": "workerFk"
+ },
+ "trainingCourse": {
+ "type": "hasMany",
+ "model": "TrainingCourse",
+ "foreignKey": "workerFk"
}
},
- "acls":[
+ "acls": [
{
"property": "__get__locker",
"accessType": "READ",
diff --git a/modules/worker/front/basic-data/index.html b/modules/worker/front/basic-data/index.html
index aa3f6ca79..bece1b6fd 100644
--- a/modules/worker/front/basic-data/index.html
+++ b/modules/worker/front/basic-data/index.html
@@ -54,8 +54,8 @@
diff --git a/modules/worker/front/create/index.html b/modules/worker/front/create/index.html
index 39b2dbf47..3030ffecd 100644
--- a/modules/worker/front/create/index.html
+++ b/modules/worker/front/create/index.html
@@ -65,7 +65,7 @@
rule>
{{code}} - {{town.name}} ({{town.province.name}},
- {{town.province.country.country}})
+ {{town.province.country.name}})
- {{name}} ({{country.country}})
+ {{name}} ({{country.name}})
@@ -99,7 +99,7 @@
value-field="name">
{{name}}, {{province.name}}
- ({{province.country.country}})
+ ({{province.country.name}})
-
+
Change password
diff --git a/modules/worker/front/pda/index.html b/modules/worker/front/pda/index.html
deleted file mode 100644
index c6d31dc85..000000000
--- a/modules/worker/front/pda/index.html
+++ /dev/null
@@ -1,50 +0,0 @@
-
@@ -249,4 +250,4 @@
v-bind:center-text="client.socialName" v-bind="$props">
-
\ No newline at end of file
+
diff --git a/print/templates/reports/delivery-note/locale/en.yml b/print/templates/reports/delivery-note/locale/en.yml
index 5902da8b3..84b31e494 100644
--- a/print/templates/reports/delivery-note/locale/en.yml
+++ b/print/templates/reports/delivery-note/locale/en.yml
@@ -20,6 +20,7 @@ vatType: VAT Type
digitalSignature: Digital signature
plantPassport: Plant passport
packages: Packages
+producer: Producer
services:
title: Services
theader:
@@ -44,7 +45,7 @@ taxes:
taxBase: Tax base
tax: Tax
fee: Fee
- tfoot:
+ tfoot:
subtotal: Subtotal
total: Total
-observations: Observations
\ No newline at end of file
+observations: Observations
diff --git a/print/templates/reports/delivery-note/locale/es.yml b/print/templates/reports/delivery-note/locale/es.yml
index d87198f45..891e59d77 100644
--- a/print/templates/reports/delivery-note/locale/es.yml
+++ b/print/templates/reports/delivery-note/locale/es.yml
@@ -15,6 +15,7 @@ discount: Dto.
vat: IVA
amount: Importe
total: Total
+producer: Productor
subtotal: Subtotal
vatType: Tipo de IVA
digitalSignature: Firma digital
@@ -45,7 +46,7 @@ taxes:
taxBase: Base imp.
tax: Tasa
fee: Cuota
- tfoot:
+ tfoot:
subtotal: Subtotal
total: Total
-observations: Observaciones
\ No newline at end of file
+observations: Observaciones
diff --git a/print/templates/reports/delivery-note/locale/fr.yml b/print/templates/reports/delivery-note/locale/fr.yml
index 603623a47..87cd2bcde 100644
--- a/print/templates/reports/delivery-note/locale/fr.yml
+++ b/print/templates/reports/delivery-note/locale/fr.yml
@@ -14,7 +14,8 @@ price: PRIX/u
discount: Remise
vat: TVA
amount: Montant
-total: Total
+producer: producteur
+total: Total
subtotal: Total partiel
vatType: Type de TVA
digitalSignature: Signature numérique
@@ -45,7 +46,7 @@ taxes:
taxBase: Base imposable
tax: Taxe
fee: Quote
- tfoot:
+ tfoot:
subtotal: Total partiel
total: Total
-observations: Observations
\ No newline at end of file
+observations: Observations
diff --git a/print/templates/reports/delivery-note/locale/pt.yml b/print/templates/reports/delivery-note/locale/pt.yml
index fb49d230b..be39eb3f0 100644
--- a/print/templates/reports/delivery-note/locale/pt.yml
+++ b/print/templates/reports/delivery-note/locale/pt.yml
@@ -14,6 +14,7 @@ price: PVP/u
discount: Dto.
vat: IVA
amount: Importe
+producer: Produtor
total: Total
subtotal: Sub-total
vatType: Tipo de IVA
@@ -45,7 +46,7 @@ taxes:
taxBase: Tributável
tax: Taxa
fee: Compartilhado
- tfoot:
+ tfoot:
subtotal: Subtotal
total: Total
-observations: Observações
\ No newline at end of file
+observations: Observações
diff --git a/print/templates/reports/delivery-note/sql/sales.sql b/print/templates/reports/delivery-note/sql/sales.sql
index c449030cf..4517473bd 100644
--- a/print/templates/reports/delivery-note/sql/sales.sql
+++ b/print/templates/reports/delivery-note/sql/sales.sql
@@ -1,43 +1,43 @@
-SELECT
- s.id,
- s.itemFk,
- s.concept,
- s.quantity,
- s.price,
- s.price - SUM(IF(ctr.id = 6, sc.value, 0)) netPrice,
- s.discount,
- i.size,
- i.stems,
- i.category,
- it.id itemTypeId,
- o.code AS origin,
- i.inkFk,
- s.ticketFk,
- tcl.code vatType,
- ib.ediBotanic botanical,
- i.tag5,
- i.value5,
- i.tag6,
- i.value6,
- i.tag7,
- i.value7
-FROM vn.sale s
- LEFT JOIN saleComponent sc ON sc.saleFk = s.id
- LEFT JOIN component cr ON cr.id = sc.componentFk
- LEFT JOIN componentType ctr ON ctr.id = cr.typeFk
- LEFT JOIN item i ON i.id = s.itemFk
- LEFT JOIN ticket t ON t.id = s.ticketFk
- LEFT JOIN origin o ON o.id = i.originFk
- LEFT JOIN country c ON c.id = o.countryFk
- LEFT JOIN supplier sp ON sp.id = t.companyFk
- LEFT JOIN itemType it ON it.id = i.typeFk
- LEFT JOIN itemCategory ic ON ic.id = it.categoryFk
- LEFT JOIN itemTaxCountry itc ON itc.itemFk = i.id
- AND itc.countryFk = sp.countryFk
- LEFT JOIN taxClass tcl ON tcl.id = itc.taxClassFk
- LEFT JOIN itemBotanicalWithGenus ib ON ib.itemFk = i.id
- AND ic.code = 'plant'
- AND ib.ediBotanic IS NOT NULL
-WHERE s.ticketFk = ?
-GROUP BY s.id
-ORDER BY (it.isPackaging), s.concept, s.itemFk
\ No newline at end of file
+SELECT s.id,
+ s.itemFk,
+ s.concept,
+ s.quantity,
+ s.price,
+ s.price - SUM(IF(ctr.code = 'freight', sc.value, 0)) netPrice,
+ s.discount,
+ i.size,
+ i.stems,
+ i.category,
+ it.id itemTypeId,
+ o.code origin,
+ i.inkFk,
+ s.ticketFk,
+ tcl.code vatType,
+ ib.ediBotanic botanical,
+ i.tag5,
+ i.value5,
+ i.tag6,
+ i.value6,
+ i.tag7,
+ i.value7,
+ i.subName
+ FROM vn.sale s
+ LEFT JOIN saleComponent sc ON sc.saleFk = s.id
+ LEFT JOIN component cr ON cr.id = sc.componentFk
+ LEFT JOIN componentType ctr ON ctr.id = cr.typeFk
+ LEFT JOIN item i ON i.id = s.itemFk
+ LEFT JOIN ticket t ON t.id = s.ticketFk
+ LEFT JOIN origin o ON o.id = i.originFk
+ LEFT JOIN country c ON c.id = o.countryFk
+ LEFT JOIN supplier sp ON sp.id = t.companyFk
+ LEFT JOIN itemType it ON it.id = i.typeFk
+ LEFT JOIN itemCategory ic ON ic.id = it.categoryFk
+ LEFT JOIN itemTaxCountry itc ON itc.itemFk = i.id
+ AND itc.countryFk = sp.countryFk
+ LEFT JOIN taxClass tcl ON tcl.id = itc.taxClassFk
+ LEFT JOIN itemBotanicalWithGenus ib ON ib.itemFk = i.id
+ AND ic.code = 'plant'
+ AND ib.ediBotanic IS NOT NULL
+ WHERE s.ticketFk = ?
+ GROUP BY s.id
+ ORDER BY (it.isPackaging), s.concept, s.itemFk
diff --git a/print/templates/reports/expedition-pallet-label/sql/labelData.sql b/print/templates/reports/expedition-pallet-label/sql/labelData.sql
index b2a805251..49a4031ae 100644
--- a/print/templates/reports/expedition-pallet-label/sql/labelData.sql
+++ b/print/templates/reports/expedition-pallet-label/sql/labelData.sql
@@ -1,19 +1,19 @@
SELECT ep.id palletFk,
t.routeFk,
- et2.description truck,
+ rs2.description truck,
r.description `zone`,
COUNT(es.id) labels,
t.warehouseFk warehouseFk,
dayname(r.created) `dayName`,
- et.id <=> rm.expeditionTruckFk isMatch
- FROM vn.expeditionTruck et
- JOIN vn.expeditionPallet ep ON ep.truckFk = et.id
+ rs.id <=> rm.roadmapStopFk isMatch
+ FROM vn.roadmapStop rs
+ JOIN vn.expeditionPallet ep ON ep.truckFk = rs.id
JOIN vn.expeditionScan es ON es.palletFk = ep.id
JOIN vn.expedition e ON e.id = es.expeditionFk
JOIN vn.ticket t ON t.id = e.ticketFk
JOIN vn.route r ON r.id = t.routeFk
LEFT JOIN vn.routesMonitor rm ON rm.routeFk = r.id
- LEFT JOIN vn.expeditionTruck et2 ON et2.id = rm.expeditionTruckFk
+ LEFT JOIN vn.roadmapStop rs2 ON rs2.id = rm.roadmapStopFk
WHERE ep.id = ?
GROUP BY ep.id, t.routeFk
ORDER BY t.routeFk
diff --git a/print/templates/reports/incoterms-authorization/sql/client.sql b/print/templates/reports/incoterms-authorization/sql/client.sql
index bb17afd1d..9eff1379c 100644
--- a/print/templates/reports/incoterms-authorization/sql/client.sql
+++ b/print/templates/reports/incoterms-authorization/sql/client.sql
@@ -4,7 +4,7 @@ SELECT
c.name,
c.fi,
c.street,
- cty.country
+ cty.name country
FROM client c
JOIN country cty ON cty.id = c.countryFk
WHERE c.id = ?
\ No newline at end of file
diff --git a/print/templates/reports/invoice-incoterms/invoice-incoterms.js b/print/templates/reports/invoice-incoterms/invoice-incoterms.js
index cfe29169b..ebeaf4d7c 100755
--- a/print/templates/reports/invoice-incoterms/invoice-incoterms.js
+++ b/print/templates/reports/invoice-incoterms/invoice-incoterms.js
@@ -9,7 +9,7 @@ module.exports = {
this.checkMainEntity(this.invoice);
this.client = await this.findOneFromDef('client', [this.reference]);
this.incoterms =
- await this.findOneFromDef('incoterms', [this.reference, this.reference, this.reference, this.reference]);
+ await this.findOneFromDef('incoterms', [this.reference]);
if (!this.incoterms)
throw new UserError(`The address of the customer must have information about Incoterms and Customs Agent`);
},
diff --git a/print/templates/reports/invoice-incoterms/sql/incoterms.sql b/print/templates/reports/invoice-incoterms/sql/incoterms.sql
index 81c0ec189..016a8342e 100644
--- a/print/templates/reports/invoice-incoterms/sql/incoterms.sql
+++ b/print/templates/reports/invoice-incoterms/sql/incoterms.sql
@@ -1,52 +1,31 @@
-SELECT pack.packages,
- a.incotermsFk,
- ic.name incotermsName,
- t.weight,
- ca.fiscalName customsAgentName,
- ca.street customsAgentStreet,
- ca.nif customsAgentNif,
- ca.phone customsAgentPhone,
- ca.email customsAgentEmail,
- CAST(vol.volume AS DECIMAL (10,2)) volume,
- intr.intrastat
- FROM vn.invoiceOut io
- JOIN vn.supplier su ON su.id = io.companyFk
- JOIN vn.client c ON c.id = io.clientFk
- LEFT JOIN vn.province p ON p.id = c.provinceFk
- JOIN vn.ticket t ON t.refFk = io.ref
- JOIN vn.address a ON a.id = t.addressFk
- JOIN vn.incoterms ic ON ic.code = a.incotermsFk
- LEFT JOIN vn.customsAgent ca ON ca.id = a.customsAgentFk
- JOIN vn.sale s ON s.ticketFk = t.id
- JOIN (
- SELECT SUM(volume) volume, COUNT(*) packages
- FROM vn.invoiceOut io
- JOIN vn.ticket t ON t.refFk = io.ref
- JOIN vn.saleVolume sv ON sv.ticketFk = t.id
- WHERE t.refFk = ?
- ) vol
- JOIN vn.itemTaxCountry itc ON itc.countryFk = su.countryFk
- AND itc.itemFk = s.itemFk
- JOIN vn.taxClass tc ON tc.id = itc.taxClassFk
- JOIN vn.invoiceOutSerial ios ON ios.code = io.serial
- AND ios.taxAreaFk = 'WORLD'
- JOIN vn.country cty ON cty.id = c.countryFk
- JOIN vn.payMethod pm ON pm.id = c .payMethodFk
- JOIN vn.company co ON co.id=io.companyFk
- JOIN vn.supplierAccount sa ON sa.id=co.supplierAccountFk
- JOIN (
- SELECT GROUP_CONCAT(DISTINCT ir.description ORDER BY ir.description SEPARATOR '. ' ) intrastat
- FROM vn.ticket t
- JOIN vn.invoiceOut io ON io.ref = t.refFk
- JOIN vn.sale s ON t.id = s.ticketFk
- JOIN vn.item i ON i.id = s.itemFk
- JOIN vn.intrastat ir ON ir.id = i.intrastatFk
- WHERE t.refFk = ?
- ) intr
- JOIN (
- SELECT SUM(packages) packages
- FROM ticket
- WHERE refFk = ?
- ) pack
- WHERE t.refFk = ?
- LIMIT 1
+WITH tickets AS(
+SELECT id, packages, addressFk, weight
+ FROM ticket
+ WHERE refFk= ?
+), volume AS(
+SELECT SUM(volume) volume
+ FROM tickets t
+ JOIN vn.saleVolume sv ON sv.ticketFk = t.id
+), intrastat AS(
+SELECT GROUP_CONCAT(DISTINCT ir.description ORDER BY ir.description SEPARATOR '. ' ) intrastat
+ FROM tickets t
+ JOIN vn.sale s ON t.id = s.ticketFk
+ JOIN vn.item i ON i.id = s.itemFk
+ JOIN vn.intrastat ir ON ir.id = i.intrastatFk
+)SELECT SUM(t.packages) packages,
+ a.incotermsFk,
+ ic.name incotermsName,
+ MAX(t.weight) weight,
+ ca.fiscalName customsAgentName,
+ ca.street customsAgentStreet,
+ ca.nif customsAgentNif,
+ ca.phone customsAgentPhone,
+ ca.email customsAgentEmail,
+ CAST(v.volume AS DECIMAL (10,2)) volume,
+ i.intrastat
+ FROM tickets t
+ JOIN vn.address a ON a.id = t.addressFk
+ JOIN vn.incoterms ic ON ic.code = a.incotermsFk
+ LEFT JOIN vn.customsAgent ca ON ca.id = a.customsAgentFk
+ JOIN volume v
+ JOIN intrastat i
diff --git a/print/templates/reports/letter-debtor/sql/client.sql b/print/templates/reports/letter-debtor/sql/client.sql
index d675cf168..87fffb8b7 100644
--- a/print/templates/reports/letter-debtor/sql/client.sql
+++ b/print/templates/reports/letter-debtor/sql/client.sql
@@ -6,7 +6,7 @@ SELECT
c.city,
c.fi,
p.name AS province,
- ct.country
+ ct.name country
FROM client c
JOIN country ct ON ct.id = c.countryFk
LEFT JOIN province p ON p.id = c.provinceFk
diff --git a/print/templates/reports/sepa-core/sepa-core.html b/print/templates/reports/sepa-core/sepa-core.html
index 363ebdfe5..e5d14d06c 100644
--- a/print/templates/reports/sepa-core/sepa-core.html
+++ b/print/templates/reports/sepa-core/sepa-core.html
@@ -27,8 +27,7 @@
{{$t('supplier.identifier')}}
-
diff --git a/print/templates/reports/sepa-core/sepa-core.js b/print/templates/reports/sepa-core/sepa-core.js
index 96c512a9d..6b941556e 100755
--- a/print/templates/reports/sepa-core/sepa-core.js
+++ b/print/templates/reports/sepa-core/sepa-core.js
@@ -7,7 +7,11 @@ module.exports = {
async serverPrefetch() {
this.client = await this.findOneFromDef('client', [this.companyId, this.companyId, this.id]);
this.checkMainEntity(this.client);
- this.supplier = await this.findOneFromDef('supplier', [this.companyId, this.companyId, this.id]);
+ const suppliers = await this.rawSqlFromDef('supplier', [this.companyId, this.companyId, this.id]);
+ this.supplier = {
+ ...suppliers[0],
+ accountDetailValue: suppliers.map(val => val?.accountDetailValue)
+ };
},
props: {
id: {
@@ -23,11 +27,11 @@ module.exports = {
methods: {
getSupplierCif() {
return db.findOne(`
- SELECT sa.iban, s.nif
+ SELECT DISTINCT ad.value
FROM supplierAccount sa
- JOIN company co ON co.supplierAccountFk = sa.id
- JOIN supplier s ON sa.supplierFk = s.id
- WHERE co.id = ?`) [this.companyId];
+ JOIN accountDetail ad ON ad.supplierAccountFk = sa.id
+ JOIN accountDetailType adt ON adt.id = ad.accountDetailTypeFk AND adt.id = 3
+ WHERE sa.supplierFk = ?`) [this.companyId];
}
}
diff --git a/print/templates/reports/sepa-core/sql/client.sql b/print/templates/reports/sepa-core/sql/client.sql
index c22e7f114..b3ba180b3 100644
--- a/print/templates/reports/sepa-core/sql/client.sql
+++ b/print/templates/reports/sepa-core/sql/client.sql
@@ -7,7 +7,7 @@ SELECT
c.city,
c.fi,
p.name AS province,
- ct.country,
+ ct.name country,
ct.code AS countryCode,
ct.ibanLength AS ibanLength
FROM client c
diff --git a/print/templates/reports/sepa-core/sql/supplier.sql b/print/templates/reports/sepa-core/sql/supplier.sql
index 80635ecf5..a32d311de 100644
--- a/print/templates/reports/sepa-core/sql/supplier.sql
+++ b/print/templates/reports/sepa-core/sql/supplier.sql
@@ -2,14 +2,15 @@ SELECT
m.code mandateCode,
s.name,
s.street,
- sc.country,
+ sc.name country,
s.postCode,
s.city,
sp.name province,
s.nif,
sa.iban,
sa.supplierFk,
- be.name bankName
+ be.name bankName,
+ ad.value accountDetailValue
FROM
client c
LEFT JOIN mandate m ON m.clientFk = c.id AND m.companyFk = ? AND m.finished IS NULL
@@ -19,9 +20,10 @@ FROM
LEFT JOIN province p ON p.id = c.provinceFk
LEFT JOIN supplierAccount sa ON sa.supplierFk = s.id
LEFT JOIN bankEntity be ON sa.bankEntityFk = be.id
+ LEFT JOIN accountDetail ad ON ad.supplierAccountFk = sa.id
+ LEFT JOIN accountDetailType adt ON adt.id = ad.accountDetailTypeFk AND adt.id = 3
WHERE
(m.companyFk = ? OR m.companyFk IS NULL)
AND (c.id = ? OR (c.id IS NULL AND c.countryFk = sa.countryFk))
ORDER BY
- m.created DESC
-LIMIT 1;
+ m.created DESC;
diff --git a/print/templates/reports/supplier-campaign-metrics/sql/supplier.sql b/print/templates/reports/supplier-campaign-metrics/sql/supplier.sql
index 0c2fa12ed..d446ba6e6 100644
--- a/print/templates/reports/supplier-campaign-metrics/sql/supplier.sql
+++ b/print/templates/reports/supplier-campaign-metrics/sql/supplier.sql
@@ -5,7 +5,7 @@ SELECT
s.id,
s.name AS supplierName,
p.name AS province,
- co.country
+ co.name country
FROM supplier s
JOIN province p ON s.provinceFk = p.id
JOIN country co ON s.countryFk = co.id
diff --git a/webpack.config.js b/webpack.config.js
index 7296a62d1..2c01a10eb 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -70,6 +70,7 @@ let baseConfig = {
]
},
optimization: {
+ nodeEnv: false,
runtimeChunk: true,
splitChunks: {
chunks: 'all',
@@ -99,9 +100,6 @@ let baseConfig = {
filename: 'index.html',
chunks: ['salix']
}),
- new webpack.DefinePlugin({
- 'process.env.NODE_ENV': JSON.stringify(env)
- })
],
devtool: 'source-map',
stats: {
-
-
-
-
-
-
-
-
-
-
-
-
- |
- |
- Item | -Quantity | -Package | -Stickers | -Weight | -Packing | -Grouping | -Buying value | -Grouping price | -Packing price | -Import | -
|---|---|---|---|---|---|---|---|---|---|---|---|
|
- |
-
-
- {{::buy.item.id}}
-
- {{::name}}
- #{{::id}}
- |
-
- |
-
- |
-
- |
-
- |
-
- |
-
- |
-
- |
-
- |
-
- |
- - - {{buy.quantity * buy.buyingValue | currency: 'EUR':2}} - - | -
| - | -- - {{::buy.item.itemType.code}} - - | -- - {{::buy.item.size}} - - | -- - {{::buy.item.minPrice | currency: 'EUR':2}} - - | -
-
-
- {{::buy.item.subName}}- |
- |||||||
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/entry/front/index/index.js b/modules/entry/front/index/index.js
deleted file mode 100644
index 8635d3fb4..000000000
--- a/modules/entry/front/index/index.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import ngModule from '../module';
-import Section from 'salix/components/section';
-
-export default class Controller extends Section {
- preview(entry) {
- this.entrySelected = entry;
- this.$.summary.show();
- }
-}
-
-ngModule.vnComponent('vnEntryIndex', {
- template: require('./index.html'),
- controller: Controller
-});
diff --git a/modules/entry/front/index/locale/es.yml b/modules/entry/front/index/locale/es.yml
deleted file mode 100644
index cebe57a42..000000000
--- a/modules/entry/front/index/locale/es.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-Inventory entry: Es inventario
-Virtual entry: Es una redada
-Supplier: Proveedor
-Currency: Moneda
-Company: Empresa
-Confirmed: Confirmada
-Ordered: Pedida
-Is raid: Redada
-Commission: Comisión
-Landed: F. entrega
-Reference: Referencia
-Created: Creado
-Booked: Contabilizada
-Is inventory: Inventario
-Status: Estado
-Selection: Selección
-Invoice number: Núm. factura
\ No newline at end of file
diff --git a/modules/entry/front/latest-buys-search-panel/index.html b/modules/entry/front/latest-buys-search-panel/index.html
deleted file mode 100644
index c73bf7365..000000000
--- a/modules/entry/front/latest-buys-search-panel/index.html
+++ /dev/null
@@ -1,242 +0,0 @@
-{{name}}
-
- {{category.name}}
-
-
- Id/Name: {{$ctrl.filter.search}}
-
-
- {{category.selection.name}}
-
-
- {{type.selection.name}}
-
-
- Sales person: {{salesPerson.selection.nickname}}
-
-
- Supplier: {{supplier.selection.name}}
-
-
- From: {{$ctrl.filter.from | date:'dd/MM/yyyy'}}
-
-
- To: {{$ctrl.filter.to | date:'dd/MM/yyyy'}}
-
-
- Active: {{$ctrl.filter.active ? '✓' : '✗'}}
-
-
- Floramondo: {{$ctrl.filter.floramondo ? '✓' : '✗'}}
-
-
- Visible: {{$ctrl.filter.visible ? '✓' : '✗'}}
-
-
- {{$ctrl.showTagInfo(chipTag)}}
-
-
-
-|
- |
- Picture | -- Item ID - | -- Packing - | -- Grouping - | -- Quantity - | -- Description - | -- Size - | -- Tags - | -- Type - | -- Intrastat - | -- Origin - | -- Weight/Piece - | -- Active - | -- Family - | -- Entry - | -- Buying value - | -- Freight value - | -- Commission value - | -- Package value - | -- Is ignored - | -- Grouping - | -- Packing - | -- Min - | -- Ekt - | -- Weight - | -- Package - | -- Package out - | -- Landing - | -
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
- |
-
- |
- - - {{::buy.itemFk}} - - | -
- |
-
- |
- {{::buy.quantity}} | -- {{::buy.description | dashIfEmpty}} - | -{{::buy.size}} | -
-
-
- {{::buy.subName}}- |
- - {{::buy.code}} - | -- {{::buy.intrastat}} - | -{{::buy.origin}} | -{{::buy.weightByPiece}} | -
- |
- {{::buy.family}} | -- - {{::buy.entryFk}} - - | -{{::buy.buyingValue | currency: 'EUR':3}} | -{{::buy.freightValue | currency: 'EUR':3}} | -{{::buy.comissionValue | currency: 'EUR':3}} | -{{::buy.packageValue | currency: 'EUR':3}} | -
- |
- {{::buy.price2 | currency: 'EUR':3}} | -{{::buy.price3 | currency: 'EUR':3}} | -{{::buy.minPrice | currency: 'EUR':3}} | -{{::buy.ektFk | dashIfEmpty}} | -{{::buy.weight}} | -{{::buy.packagingFk}} | -{{::buy.packingOut}} | -{{::buy.landing | date: 'dd/MM/yyyy'}} | -
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/entry/front/search-panel/index.js b/modules/entry/front/search-panel/index.js
deleted file mode 100644
index e87f31056..000000000
--- a/modules/entry/front/search-panel/index.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import ngModule from '../module';
-import SearchPanel from 'core/components/searchbar/search-panel';
-
-ngModule.vnComponent('vnEntrySearchPanel', {
- template: require('./index.html'),
- controller: SearchPanel
-});
diff --git a/modules/entry/front/search-panel/locale/es.yml b/modules/entry/front/search-panel/locale/es.yml
deleted file mode 100644
index 05b71da99..000000000
--- a/modules/entry/front/search-panel/locale/es.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-Ticket id: Id ticket
-Client id: Id cliente
-Nickname: Alias
-From: Desde
-To: Hasta
-Agency: Agencia
-Warehouse: Almacén
-Search entry by id or a suppliers by name or alias: Buscar entrada por id o proveedores por nombre y alias
-Invoice number: Núm. factura
\ No newline at end of file
diff --git a/modules/entry/front/summary/index.html b/modules/entry/front/summary/index.html
deleted file mode 100644
index baa310bb6..000000000
--- a/modules/entry/front/summary/index.html
+++ /dev/null
@@ -1,196 +0,0 @@
-
-
-
- Buys
-| Quantity | -Stickers | -Package | -Weight | -Packing | -Grouping | -Buying value | -Import | -PVP | -|
|---|---|---|---|---|---|---|---|---|---|
| {{::line.quantity}} | -{{::line.stickers | dashIfEmpty}} | -{{::line.packagingFk | dashIfEmpty}} | -{{::line.weight}} | -
- |
-
- | {{::line.buyingValue | currency: 'EUR':2}} | -{{::line.quantity * line.buyingValue | currency: 'EUR':2}} | -{{::line.price2 | currency: 'EUR':2 | dashIfEmpty}} / {{::line.price3 | currency: 'EUR':2 | dashIfEmpty}} | -|
| - - {{::line.item.itemType.code}} - - | -- - {{::line.item.id}} - - | -- - {{::line.item.size}} - - | -- - {{::line.item.minPrice | currency: 'EUR':2}} - - | -
-
-
- {{::line.item.subName}}- |
- |||||
| - | |||||||||
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/modules/worker/front/pda/index.js b/modules/worker/front/pda/index.js
index 885261e5c..c3616b41e 100644
--- a/modules/worker/front/pda/index.js
+++ b/modules/worker/front/pda/index.js
@@ -1,53 +1,18 @@
import ngModule from '../module';
import Section from 'salix/components/section';
-import './style.scss';
class Controller extends Section {
constructor($element, $) {
super($element, $);
- const filter = {
- where: {userFk: this.$params.id},
- include: {relation: 'deviceProduction'}
- };
- this.$http.get('DeviceProductionUsers', {filter}).
- then(res => {
- if (res.data && res.data.length > 0)
- this.setCurrentPDA(res.data[0]);
- });
}
- deallocatePDA() {
- this.$http.post(`Workers/${this.$params.id}/deallocatePDA`, {pda: this.currentPDA.deviceProductionFk})
- .then(() => {
- this.vnApp.showSuccess(this.$t('PDA deallocated'));
- delete this.currentPDA;
- });
- }
-
- allocatePDA() {
- this.$http.post(`Workers/${this.$params.id}/allocatePDA`, {pda: this.newPDA})
- .then(res => {
- if (res.data)
- this.setCurrentPDA(res.data);
-
- this.vnApp.showSuccess(this.$t('PDA allocated'));
- delete this.newPDA;
- });
- }
-
- setCurrentPDA(data) {
- this.currentPDA = data;
- this.currentPDA.description = [];
- this.currentPDA.description.push(`ID: ${this.currentPDA.deviceProductionFk}`);
- this.currentPDA.description.push(`${this.$t('Model')}: ${this.currentPDA.deviceProduction.modelFk}`);
- this.currentPDA.description.push(`${this.$t('Serial Number')}: ${this.currentPDA.deviceProduction.serialNumber}`);
- this.currentPDA.description = this.currentPDA.description.join(' ');
+ async $onInit() {
+ const url = await this.vnApp.getUrl(`worker/${this.$params.id}/pda`);
+ this.$state.go('worker.card.summary', {id: this.$params.id});
+ window.location.href = url;
}
}
-Controller.$inject = ['$element', '$scope'];
-
ngModule.vnComponent('vnWorkerPda', {
- template: require('./index.html'),
- controller: Controller,
+ controller: Controller
});
diff --git a/modules/worker/front/pda/index.spec.js b/modules/worker/front/pda/index.spec.js
deleted file mode 100644
index a0540af45..000000000
--- a/modules/worker/front/pda/index.spec.js
+++ /dev/null
@@ -1,72 +0,0 @@
-import './index';
-
-describe('Worker', () => {
- describe('Component vnWorkerPda', () => {
- let $httpBackend;
- let $scope;
- let $element;
- let controller;
-
- beforeEach(ngModule('worker'));
-
- beforeEach(inject(($componentController, $rootScope, _$httpBackend_) => {
- $httpBackend = _$httpBackend_;
- $scope = $rootScope.$new();
- $element = angular.element('
- {{town.province.name}}, {{town.province.country.country}}
+ {{town.province.name}}, {{town.province.country.name}}
diff --git a/myt.config.yml b/myt.config.yml
index 17300aa37..56239ca3c 100755
--- a/myt.config.yml
+++ b/myt.config.yml
@@ -227,7 +227,7 @@ localFixtures:
- expeditionScan
- expeditionState
- expeditionStateType
- - expeditionTruck
+ - roadmapStop
- expense
- genus
- greuge
diff --git a/package.json b/package.json
index 906b86dff..ea126bce3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "salix-back",
- "version": "24.22.0",
+ "version": "24.30.0",
"author": "Verdnatura Levante SL",
"description": "Salix backend",
"license": "GPL-3.0",
@@ -82,6 +82,8 @@
"gulp-print": "^2.0.1",
"gulp-wrap": "^0.15.0",
"gulp-yaml": "^1.0.1",
+ "gulp-rename": "^2.0.0",
+ "gulp-replace": "^1.1.4",
"html-loader": "^0.4.5",
"html-loader-jest": "^0.2.1",
"html-webpack-plugin": "^5.5.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c4425d3dc..22d5b46f1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -202,6 +202,12 @@ devDependencies:
gulp-print:
specifier: ^2.0.1
version: 2.0.1
+ gulp-rename:
+ specifier: ^2.0.0
+ version: 2.0.0
+ gulp-replace:
+ specifier: ^1.1.4
+ version: 1.1.4
gulp-wrap:
specifier: ^0.15.0
version: 0.15.0(ejs@2.3.1)
@@ -2632,6 +2638,10 @@ packages:
resolution: {integrity: sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==}
dev: true
+ /@types/expect@1.20.4:
+ resolution: {integrity: sha512-Q5Vn3yjTDyCMV50TB6VRIbQNxSE4OmZR86VSbGaNpfUolm0iePBB4KdEEHmxoY5sT2+2DIvXW0rvMDP2nHZ4Mg==}
+ dev: true
+
/@types/express-serve-static-core@4.17.42:
resolution: {integrity: sha512-ckM3jm2bf/MfB3+spLPWYPUH573plBFwpOhqQ2WottxYV85j1HQFlxmnTq57X1yHY9awZPig06hL/cLMgNWHIQ==}
dependencies:
@@ -2790,6 +2800,13 @@ packages:
resolution: {integrity: sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==}
dev: false
+ /@types/vinyl@2.0.12:
+ resolution: {integrity: sha512-Sr2fYMBUVGYq8kj3UthXFAu5UN6ZW+rYr4NACjZQJvHvj+c8lYv0CahmZ2P/r7iUkN44gGUBwqxZkrKXYPb7cw==}
+ dependencies:
+ '@types/expect': 1.20.4
+ '@types/node': 20.11.16
+ dev: true
+
/@types/yargs-parser@21.0.3:
resolution: {integrity: sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==}
dev: true
@@ -3770,6 +3787,11 @@ packages:
engines: {node: '>=8'}
dev: true
+ /binaryextensions@2.3.0:
+ resolution: {integrity: sha512-nAihlQsYGyc5Bwq6+EsubvANYGExeJKHDO3RjnvwU042fawQTQfM3Kxn7IHUXQOz4bzfwsGYYHGSvXyW4zOGLg==}
+ engines: {node: '>=0.8'}
+ dev: true
+
/bindings@1.5.0:
resolution: {integrity: sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==}
requiresBuild: true
@@ -7090,6 +7112,22 @@ packages:
map-stream: 0.0.7
dev: true
+ /gulp-rename@2.0.0:
+ resolution: {integrity: sha512-97Vba4KBzbYmR5VBs9mWmK+HwIf5mj+/zioxfZhOKeXtx5ZjBk57KFlePf5nxq9QsTtFl0ejnHE3zTC9MHXqyQ==}
+ engines: {node: '>=4'}
+ dev: true
+
+ /gulp-replace@1.1.4:
+ resolution: {integrity: sha512-SVSF7ikuWKhpAW4l4wapAqPPSToJoiNKsbDoUnRrSgwZHH7lH8pbPeQj1aOVYQrbZKhfSVBxVW+Py7vtulRktw==}
+ engines: {node: '>=10'}
+ dependencies:
+ '@types/node': 20.11.16
+ '@types/vinyl': 2.0.12
+ istextorbinary: 3.3.0
+ replacestream: 4.0.3
+ yargs-parser: 21.1.1
+ dev: true
+
/gulp-util@3.0.8:
resolution: {integrity: sha512-q5oWPc12lwSFS9h/4VIjG+1NuNDlJ48ywV2JKItY4Ycc/n1fXJeYPVQsfu5ZrhQi7FGSDBalwUCLar/GyHXKGw==}
engines: {node: '>=0.10'}
@@ -8324,6 +8362,14 @@ packages:
istanbul-lib-report: 3.0.1
dev: true
+ /istextorbinary@3.3.0:
+ resolution: {integrity: sha512-Tvq1W6NAcZeJ8op+Hq7tdZ434rqnMx4CCZ7H0ff83uEloDvVbqAwaMTZcafKGJT0VHkYzuXUiCY4hlXQg6WfoQ==}
+ engines: {node: '>=8'}
+ dependencies:
+ binaryextensions: 2.3.0
+ textextensions: 3.3.0
+ dev: true
+
/jackspeak@2.3.6:
resolution: {integrity: sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==}
engines: {node: '>=14'}
@@ -12065,6 +12111,14 @@ packages:
remove-trailing-separator: 1.1.0
dev: true
+ /replacestream@4.0.3:
+ resolution: {integrity: sha512-AC0FiLS352pBBiZhd4VXB1Ab/lh0lEgpP+GGvZqbQh8a5cmXVoTe5EX/YeTFArnp4SRGTHh1qCHu9lGs1qG8sA==}
+ dependencies:
+ escape-string-regexp: 1.0.5
+ object-assign: 4.1.1
+ readable-stream: 2.3.8
+ dev: true
+
/request@2.88.2:
resolution: {integrity: sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==}
engines: {node: '>= 6'}
@@ -13563,6 +13617,11 @@ packages:
resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==}
dev: true
+ /textextensions@3.3.0:
+ resolution: {integrity: sha512-mk82dS8eRABNbeVJrEiN5/UMSCliINAuz8mkUwH4SwslkNP//gbEzlWNS5au0z5Dpx40SQxzqZevZkn+WYJ9Dw==}
+ engines: {node: '>=8'}
+ dev: true
+
/throat@5.0.0:
resolution: {integrity: sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==}
dev: true
diff --git a/print/core/components/email-footer/email-footer.html b/print/core/components/email-footer/email-footer.html
index 9c5df59a9..5cacdd129 100644
--- a/print/core/components/email-footer/email-footer.html
+++ b/print/core/components/email-footer/email-footer.html
@@ -1,19 +1,16 @@
{{supplier.iban}}
- {{supplier.nif}}
+ {{supplier.accountDetailValue.join(', ')}}