{{::address.phone}},
diff --git a/modules/client/front/consumption/index.html b/modules/client/front/consumption/index.html
index 17e1e8c8b..06611da5a 100644
--- a/modules/client/front/consumption/index.html
+++ b/modules/client/front/consumption/index.html
@@ -77,8 +77,7 @@
tabindex="-1">
- {{::sale.quantity | dashIfEmpty}}
-
+ {{::sale.quantity | dashIfEmpty}}
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/fiscal-data/index.html b/modules/client/front/fiscal-data/index.html
index c2bf86f70..c366c8ca3 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}})
diff --git a/modules/client/front/summary/index.html b/modules/client/front/summary/index.html
index a42e192d0..3a46a4959 100644
--- a/modules/client/front/summary/index.html
+++ b/modules/client/front/summary/index.html
@@ -104,7 +104,7 @@
value="{{$ctrl.summary.province.name}}">
+ 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/entryOrderPdf.js b/modules/entry/back/methods/entry/entryOrderPdf.js
index 2f6489d3f..7a432123e 100644
--- a/modules/entry/back/methods/entry/entryOrderPdf.js
+++ b/modules/entry/back/methods/entry/entryOrderPdf.js
@@ -34,7 +34,7 @@ module.exports = Self => {
path: '/:id/entry-order-pdf',
verb: 'GET'
},
- //accessScopes: ['read:multimedia']
+ accessScopes: ['DEFAULT', 'read:multimedia']
});
Self.entryOrderPdf = (ctx, id) => Self.printReport(ctx, id, 'entry-order');
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 fa804f4d8..14cafde06 100644
--- a/modules/entry/back/models/buy.json
+++ b/modules/entry/back/models/buy.json
@@ -34,7 +34,7 @@
"type": "number"
},
"groupingMode": {
- "type": "number"
+ "type": "string"
},
"comissionValue": {
"type": "number"
@@ -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.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
index 6bccb0b5f..57de1c5f7 100644
--- a/modules/entry/front/basic-data/index.html
+++ b/modules/entry/front/basic-data/index.html
@@ -123,7 +123,9 @@
+ ng-model="$ctrl.entry.isBooked"
+ vn-acl="administrative"
+ >
diff --git a/modules/entry/front/buy/index/index.html b/modules/entry/front/buy/index/index.html
index 203d6c522..0e0c69788 100644
--- a/modules/entry/front/buy/index/index.html
+++ b/modules/entry/front/buy/index/index.html
@@ -119,13 +119,13 @@
@@ -140,13 +140,13 @@
diff --git a/modules/entry/front/buy/index/index.js b/modules/entry/front/buy/index/index.js
index c991b745b..9131c31f6 100644
--- a/modules/entry/front/buy/index/index.js
+++ b/modules/entry/front/buy/index/index.js
@@ -53,12 +53,8 @@ export default class Controller extends Section {
}
toggleGroupingMode(buy, mode) {
- const grouping = 1;
- const packing = 2;
- const groupingMode = mode === 'grouping' ? grouping : packing;
-
- const newGroupingMode = buy.groupingMode === groupingMode ? 0 : groupingMode;
-
+ const groupingMode = mode === 'grouping' ? mode : 'packing';
+ const newGroupingMode = buy.groupingMode === groupingMode ? null : groupingMode;
const params = {
groupingMode: newGroupingMode
};
diff --git a/modules/entry/front/buy/index/index.spec.js b/modules/entry/front/buy/index/index.spec.js
index b9d5fab51..f5c6d1bdb 100644
--- a/modules/entry/front/buy/index/index.spec.js
+++ b/modules/entry/front/buy/index/index.spec.js
@@ -57,45 +57,34 @@ describe('Entry buy', () => {
describe('toggleGroupingMode()', () => {
it(`should toggle grouping mode from grouping to packing`, () => {
- const grouping = 1;
- const packing = 2;
- const buy = {id: 999, groupingMode: grouping};
+ const buy = {id: 999, groupingMode: 'grouping'};
const query = `Buys/${buy.id}`;
- $httpBackend.expectPATCH(query, {groupingMode: packing}).respond(200);
+ $httpBackend.expectPATCH(query, {groupingMode: 'packing'}).respond(200);
controller.toggleGroupingMode(buy, 'packing');
$httpBackend.flush();
});
it(`should toggle grouping mode from packing to grouping`, () => {
- const grouping = 1;
- const packing = 2;
- const buy = {id: 999, groupingMode: packing};
-
+ const buy = {id: 999, groupingMode: 'packing'};
const query = `Buys/${buy.id}`;
- $httpBackend.expectPATCH(query, {groupingMode: grouping}).respond(200);
+ $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 noGrouping = 0;
- const packing = 2;
- const buy = {id: 999, groupingMode: packing};
-
+ const buy = {id: 999, groupingMode: 'packing'};
const query = `Buys/${buy.id}`;
- $httpBackend.expectPATCH(query, {groupingMode: noGrouping}).respond(200);
+ $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 noGrouping = 0;
- const grouping = 1;
- const buy = {id: 999, groupingMode: grouping};
-
+ const buy = {id: 999, groupingMode: 'grouping'};
const query = `Buys/${buy.id}`;
- $httpBackend.expectPATCH(query, {groupingMode: noGrouping}).respond(200);
+ $httpBackend.expectPATCH(query, {groupingMode: null}).respond(200);
controller.toggleGroupingMode(buy, 'grouping');
$httpBackend.flush();
});
diff --git a/modules/entry/front/latest-buys/index.html b/modules/entry/front/latest-buys/index.html
index 16e039cf0..2e6de83b9 100644
--- a/modules/entry/front/latest-buys/index.html
+++ b/modules/entry/front/latest-buys/index.html
@@ -143,12 +143,12 @@
-
+
{{::buy.packing | dashIfEmpty}}
-
+
{{::buy.grouping | dashIfEmpty}}
diff --git a/modules/entry/front/summary/index.html b/modules/entry/front/summary/index.html
index 655dcd66f..baa310bb6 100644
--- a/modules/entry/front/summary/index.html
+++ b/modules/entry/front/summary/index.html
@@ -121,12 +121,12 @@
{{::line.packagingFk | dashIfEmpty}}
{{::line.weight}}
-
+
{{::line.packing | dashIfEmpty}}
-
+
{{::line.grouping | dashIfEmpty}}
diff --git a/modules/invoiceIn/back/methods/invoice-in-due-day/specs/new.spec.js b/modules/invoiceIn/back/methods/invoice-in-due-day/specs/new.spec.js
index c188a511d..f21dad9f2 100644
--- a/modules/invoiceIn/back/methods/invoice-in-due-day/specs/new.spec.js
+++ b/modules/invoiceIn/back/methods/invoice-in-due-day/specs/new.spec.js
@@ -13,11 +13,10 @@ describe('invoiceInDueDay new()', () => {
it('should correctly create a new due day', async() => {
const userId = 9;
- const invoiceInFk = 6;
+ const invoiceInFk = 3;
const ctx = {
req: {
-
accessToken: {userId: userId},
}
};
diff --git a/modules/invoiceIn/back/methods/invoice-in/exchangeRateUpdate.js b/modules/invoiceIn/back/methods/invoice-in/exchangeRateUpdate.js
new file mode 100644
index 000000000..989b1d4a2
--- /dev/null
+++ b/modules/invoiceIn/back/methods/invoice-in/exchangeRateUpdate.js
@@ -0,0 +1,78 @@
+const axios = require('axios');
+const {DOMParser} = require('xmldom');
+const UserError = require('vn-loopback/util/user-error');
+
+module.exports = Self => {
+ Self.remoteMethod('exchangeRateUpdate', {
+ description: 'Updates the exchange rates from an XML feed',
+ accessType: 'WRITE',
+ accepts: [],
+ http: {
+ path: '/exchangeRateUpdate',
+ verb: 'post'
+ }
+ });
+
+ Self.exchangeRateUpdate = async() => {
+ const response = await axios.get('http://www.ecb.europa.eu/stats/eurofxref/eurofxref-hist-90d.xml');
+ const xmlData = response.data;
+
+ const doc = new DOMParser({errorHandler: {warning: () => {}}})?.parseFromString(xmlData, 'text/xml');
+ const cubes = doc?.getElementsByTagName('Cube');
+ if (!cubes || cubes.length === 0)
+ throw new UserError('No cubes found. Exiting the method.');
+
+ const models = Self.app.models;
+
+ const maxDateRecord = await models.ReferenceRate.findOne({order: 'dated DESC'});
+
+ const maxDate = maxDateRecord?.dated ? new Date(maxDateRecord.dated) : null;
+
+ for (const cube of Array.from(cubes)) {
+ if (cube.nodeType === doc.ELEMENT_NODE && cube.attributes.getNamedItem('time')) {
+ const xmlDate = new Date(cube.getAttribute('time'));
+ const xmlDateWithoutTime = new Date(xmlDate.getFullYear(), xmlDate.getMonth(), xmlDate.getDate());
+ if (!maxDate || maxDate < xmlDateWithoutTime) {
+ for (const rateCube of Array.from(cube.childNodes)) {
+ if (rateCube.nodeType === doc.ELEMENT_NODE) {
+ const currencyCode = rateCube.getAttribute('currency');
+ const rate = rateCube.getAttribute('rate');
+ if (['USD', 'CNY', 'GBP'].includes(currencyCode)) {
+ const currency = await models.Currency.findOne({where: {code: currencyCode}});
+ if (!currency) throw new UserError(`Currency not found for code: ${currencyCode}`);
+ const existingRate = await models.ReferenceRate.findOne({
+ where: {currencyFk: currency.id, dated: xmlDate}
+ });
+
+ if (existingRate) {
+ if (existingRate.value !== rate)
+ await existingRate.updateAttributes({value: rate});
+ } else {
+ await models.ReferenceRate.create({
+ currencyFk: currency.id,
+ dated: xmlDate,
+ value: rate
+ });
+ }
+ const monday = 1;
+ if (xmlDateWithoutTime.getDay() === monday) {
+ const saturday = new Date(xmlDateWithoutTime);
+ saturday.setDate(xmlDateWithoutTime.getDate() - 2);
+ const sunday = new Date(xmlDateWithoutTime);
+ sunday.setDate(xmlDateWithoutTime.getDate() - 1);
+
+ for (const date of [saturday, sunday]) {
+ await models.ReferenceRate.upsertWithWhere(
+ {currencyFk: currency.id, dated: date},
+ {currencyFk: currency.id, dated: date, value: rate}
+ );
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ };
+};
diff --git a/modules/invoiceIn/back/methods/invoice-in/invoiceInPdf.js b/modules/invoiceIn/back/methods/invoice-in/invoiceInPdf.js
index 681a19fc6..1e9da86a4 100644
--- a/modules/invoiceIn/back/methods/invoice-in/invoiceInPdf.js
+++ b/modules/invoiceIn/back/methods/invoice-in/invoiceInPdf.js
@@ -29,7 +29,8 @@ module.exports = Self => {
http: {
path: '/:id/invoice-in-pdf',
verb: 'GET'
- }
+ },
+ accessScopes: ['DEFAULT', 'read:multimedia']
});
Self.invoiceInPdf = (ctx, id) => Self.printReport(ctx, id, 'invoiceIn');
diff --git a/modules/invoiceIn/back/methods/invoice-in/specs/exchangeRateUpdate.spec.js b/modules/invoiceIn/back/methods/invoice-in/specs/exchangeRateUpdate.spec.js
new file mode 100644
index 000000000..0fd7ea165
--- /dev/null
+++ b/modules/invoiceIn/back/methods/invoice-in/specs/exchangeRateUpdate.spec.js
@@ -0,0 +1,52 @@
+describe('exchangeRateUpdate functionality', function() {
+ const axios = require('axios');
+ const models = require('vn-loopback/server/server').models;
+
+ beforeEach(function() {
+ spyOn(axios, 'get').and.returnValue(Promise.resolve({
+ data: `
+
+
+ `
+ }));
+ });
+
+ it('should process XML data and update or create rates in the database', async function() {
+ spyOn(models.ReferenceRate, 'findOne').and.returnValue(Promise.resolve(null));
+ spyOn(models.ReferenceRate, 'create').and.returnValue(Promise.resolve());
+
+ await models.InvoiceIn.exchangeRateUpdate();
+
+ expect(models.ReferenceRate.create).toHaveBeenCalledTimes(2);
+ });
+
+ it('should not create or update rates when no XML data is available', async function() {
+ axios.get.and.returnValue(Promise.resolve({}));
+ spyOn(models.ReferenceRate, 'create');
+
+ let thrownError = null;
+ try {
+ await models.InvoiceIn.exchangeRateUpdate();
+ } catch (error) {
+ thrownError = error;
+ }
+
+ expect(thrownError.message).toBe('No cubes found. Exiting the method.');
+ });
+
+ it('should handle errors gracefully', async function() {
+ axios.get.and.returnValue(Promise.reject(new Error('Network error')));
+ let error;
+
+ try {
+ await models.InvoiceIn.exchangeRateUpdate();
+ } catch (e) {
+ error = e;
+ }
+
+ expect(error).toBeDefined();
+ expect(error.message).toBe('Network error');
+ });
+});
diff --git a/modules/invoiceIn/back/methods/invoice-in/specs/filter.spec.js b/modules/invoiceIn/back/methods/invoice-in/specs/filter.spec.js
index 9834989fc..ff2164783 100644
--- a/modules/invoiceIn/back/methods/invoice-in/specs/filter.spec.js
+++ b/modules/invoiceIn/back/methods/invoice-in/specs/filter.spec.js
@@ -158,7 +158,7 @@ describe('InvoiceIn filter()', () => {
const result = await models.InvoiceIn.filter(ctx, {}, options);
- expect(result.length).toEqual(6);
+ expect(result.length).toEqual(5);
await tx.rollback();
} catch (e) {
@@ -180,7 +180,7 @@ describe('InvoiceIn filter()', () => {
const result = await models.InvoiceIn.filter(ctx, {}, options);
- expect(result.length).toEqual(6);
+ expect(result.length).toEqual(5);
expect(result[0].isBooked).toBeTruthy();
await tx.rollback();
diff --git a/modules/invoiceIn/back/methods/invoice-in/specs/toUnbook.spec.js b/modules/invoiceIn/back/methods/invoice-in/specs/toUnbook.spec.js
new file mode 100644
index 000000000..b7d98e307
--- /dev/null
+++ b/modules/invoiceIn/back/methods/invoice-in/specs/toUnbook.spec.js
@@ -0,0 +1,32 @@
+const models = require('vn-loopback/server/server').models;
+
+describe('invoiceIn toUnbook()', () => {
+ it('should check that invoiceIn is unbooked', async() => {
+ const userId = 1;
+ const ctx = {
+ req: {
+
+ accessToken: {userId: userId},
+ headers: {origin: 'http://localhost:5000'},
+ }
+ };
+ const invoiceInId = 1;
+ const tx = await models.InvoiceIn.beginTransaction({});
+ const options = {transaction: tx};
+
+ try {
+ await models.InvoiceIn.toBook(ctx, invoiceInId, options);
+ const bookEntry = await models.InvoiceIn.toUnbook(ctx, invoiceInId, options);
+ const invoiceIn = await models.InvoiceIn.findById(invoiceInId, null, options);
+
+ expect(bookEntry.accountingEntries).toEqual(4);
+ expect(bookEntry.isLinked).toBeFalsy();
+ expect(invoiceIn.isBooked).toEqual(false);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+});
diff --git a/modules/invoiceIn/back/methods/invoice-in/toBook.js b/modules/invoiceIn/back/methods/invoice-in/toBook.js
index 778742911..c3be5f8fc 100644
--- a/modules/invoiceIn/back/methods/invoice-in/toBook.js
+++ b/modules/invoiceIn/back/methods/invoice-in/toBook.js
@@ -32,7 +32,7 @@ module.exports = Self => {
}
try {
- await Self.rawSql(`CALL vn.invoiceIn_booking(?)`, [id], myOptions);
+ await Self.rawSql(`CALL vn.invoiceIn_booking(?, NULL)`, [id], myOptions);
if (tx) await tx.commit();
} catch (e) {
if (tx) await tx.rollback();
diff --git a/modules/invoiceIn/back/methods/invoice-in/toUnbook.js b/modules/invoiceIn/back/methods/invoice-in/toUnbook.js
new file mode 100644
index 000000000..a697e9ddc
--- /dev/null
+++ b/modules/invoiceIn/back/methods/invoice-in/toUnbook.js
@@ -0,0 +1,80 @@
+module.exports = Self => {
+ Self.remoteMethodCtx('toUnbook', {
+ description: 'To unbook the invoiceIn',
+ accessType: 'WRITE',
+ accepts: {
+ arg: 'id',
+ type: 'number',
+ required: true,
+ description: 'The invoiceIn id',
+ http: {source: 'path'}
+ },
+ returns: {
+ type: 'object',
+ root: true
+ },
+ http: {
+ path: '/:id/toUnbook',
+ verb: 'POST'
+ }
+ });
+
+ Self.toUnbook = async(ctx, invoiceInId, options) => {
+ let tx;
+ const models = Self.app.models;
+ const myOptions = {userId: ctx.req.accessToken.userId};
+
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
+
+ if (!myOptions.transaction) {
+ tx = await Self.beginTransaction({});
+ myOptions.transaction = tx;
+ }
+
+ try {
+ let isLinked;
+ let accountingEntries;
+
+ let bookEntry = await models.Xdiario.findOne({
+ fields: ['ASIEN'],
+ where: {
+ and: [
+ {key: invoiceInId},
+ {enlazado: false},
+ {enlazadoSage: false}
+ ]
+ }
+ }, myOptions);
+
+ let asien = bookEntry?.ASIEN;
+ if (asien) {
+ accountingEntries = await models.Xdiario.count({ASIEN: asien}, myOptions);
+
+ await models.Xdiario.destroyAll({ASIEN: asien}, myOptions);
+ await Self.updateAll({id: invoiceInId}, {isBooked: false}, myOptions);
+ } else {
+ const linkedBookEntry = await models.Xdiario.findOne({
+ fields: ['ASIEN'],
+ where: {
+ key: invoiceInId,
+ and: [{or: [{enlazado: true, enlazadoSage: true}]}]
+ }
+ }, myOptions);
+
+ asien = linkedBookEntry?.ASIEN;
+ isLinked = true;
+ }
+ if (tx) await tx.commit();
+
+ return {
+ isLinked,
+ bookEntry: asien,
+ accountingEntries
+ };
+ } catch (e) {
+ if (tx) await tx.rollback();
+ throw e;
+ }
+ };
+};
diff --git a/modules/invoiceIn/back/methods/invoice-in/updateInvoiceIn.js b/modules/invoiceIn/back/methods/invoice-in/updateInvoiceIn.js
new file mode 100644
index 000000000..92a1ba8ee
--- /dev/null
+++ b/modules/invoiceIn/back/methods/invoice-in/updateInvoiceIn.js
@@ -0,0 +1,104 @@
+module.exports = Self => {
+ Self.remoteMethodCtx('updateInvoiceIn', {
+ description: 'To update the invoiceIn attributes',
+ accessType: 'WRITE',
+ accepts: [{
+ arg: 'id',
+ type: 'number',
+ required: true,
+ description: 'The invoiceIn id',
+ http: {source: 'path'}
+ }, {
+ arg: 'supplierFk',
+ type: 'number',
+ required: true
+ }, {
+ arg: 'supplierRef',
+ type: 'any',
+ }, {
+ arg: 'issued',
+ type: 'any',
+ }, {
+ arg: 'operated',
+ type: 'any',
+ }, {
+ arg: 'deductibleExpenseFk',
+ type: 'any',
+ }, {
+ arg: 'dmsFk',
+ type: 'any',
+ }, {
+ arg: 'bookEntried',
+ type: 'any',
+ }, {
+ arg: 'booked',
+ type: 'any',
+ }, {
+ arg: 'currencyFk',
+ type: 'number',
+ required: true
+ }, {
+ arg: 'companyFk',
+ type: 'any',
+ }, {
+ arg: 'withholdingSageFk',
+ type: 'any',
+ },
+ ],
+ returns: {
+ type: 'object',
+ root: true
+ },
+ http: {
+ path: '/:id/updateInvoiceIn',
+ verb: 'PATCH'
+ }
+ });
+
+ Self.updateInvoiceIn = async(ctx,
+ id,
+ supplierFk,
+ supplierRef,
+ issued,
+ operated,
+ deductibleExpenseFk,
+ dmsFk,
+ bookEntried,
+ booked,
+ currencyFk,
+ companyFk,
+ withholdingSageFk,
+ options
+ ) => {
+ let tx;
+ const myOptions = {userId: ctx.req.accessToken.userId};
+
+ if (typeof options == 'object') Object.assign(myOptions, options);
+
+ if (!myOptions.transaction) {
+ tx = await Self.beginTransaction({});
+ myOptions.transaction = tx;
+ }
+
+ try {
+ const invoiceIn = await Self.findById(id, null, myOptions);
+ invoiceIn.updateAttributes({supplierFk,
+ supplierRef,
+ issued,
+ operated,
+ deductibleExpenseFk,
+ dmsFk,
+ bookEntried,
+ booked,
+ currencyFk,
+ companyFk,
+ withholdingSageFk
+ }, myOptions);
+ if (tx) await tx.commit();
+ return invoiceIn;
+ } catch (e) {
+ if (tx) await tx.rollback();
+ throw e;
+ }
+ };
+};
diff --git a/modules/invoiceIn/back/models/invoice-in-config.json b/modules/invoiceIn/back/models/invoice-in-config.json
index c0236e654..638a97fa3 100644
--- a/modules/invoiceIn/back/models/invoice-in-config.json
+++ b/modules/invoiceIn/back/models/invoice-in-config.json
@@ -26,7 +26,7 @@
"sageWithholding": {
"type": "belongsTo",
"model": "SageWithholding",
- "foreignKey": "sageWithholdingFk"
+ "foreignKey": "sageFarmerWithholdingFk"
}
},
"acls": [{
diff --git a/modules/invoiceIn/back/models/invoice-in.js b/modules/invoiceIn/back/models/invoice-in.js
index af5efbcdf..1e69c0ef8 100644
--- a/modules/invoiceIn/back/models/invoice-in.js
+++ b/modules/invoiceIn/back/models/invoice-in.js
@@ -10,6 +10,9 @@ module.exports = Self => {
require('../methods/invoice-in/invoiceInEmail')(Self);
require('../methods/invoice-in/getSerial')(Self);
require('../methods/invoice-in/corrective')(Self);
+ require('../methods/invoice-in/exchangeRateUpdate')(Self);
+ require('../methods/invoice-in/toUnbook')(Self);
+ require('../methods/invoice-in/updateInvoiceIn')(Self);
Self.rewriteDbError(function(err) {
if (err.code === 'ER_ROW_IS_REFERENCED_2' && err.sqlMessage.includes('vehicleInvoiceIn'))
diff --git a/modules/invoiceIn/front/basic-data/index.html b/modules/invoiceIn/front/basic-data/index.html
index a22abbb33..fbb9b05a2 100644
--- a/modules/invoiceIn/front/basic-data/index.html
+++ b/modules/invoiceIn/front/basic-data/index.html
@@ -1,4 +1,4 @@
-
diff --git a/modules/invoiceIn/front/descriptor/index.js b/modules/invoiceIn/front/descriptor/index.js
index e005211a3..8fe270fa0 100644
--- a/modules/invoiceIn/front/descriptor/index.js
+++ b/modules/invoiceIn/front/descriptor/index.js
@@ -112,7 +112,7 @@ class Controller extends Descriptor {
}
isAgricultural() {
- return this.invoiceIn.supplier.sageWithholdingFk == this.config[0].sageWithholdingFk;
+ return this.invoiceIn.supplier.sageWithholdingFk == this.config[0].sageFarmerWithholdingFk;
}
}
diff --git a/modules/invoiceOut/back/methods/invoiceOut/createManualInvoice.js b/modules/invoiceOut/back/methods/invoiceOut/createManualInvoice.js
index 043dfbead..c46da0ba5 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/createManualInvoice.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/createManualInvoice.js
@@ -46,12 +46,11 @@ module.exports = Self => {
}
});
- Self.createManualInvoice = async(ctx, options) => {
+ Self.createManualInvoice = async(ctx, clientFk, ticketFk, maxShipped, serial, taxArea, reference, options) => {
+ if (!clientFk && !ticketFk) throw new UserError(`Select ticket or client`);
const models = Self.app.models;
- const args = ctx.args;
-
- let tx;
const myOptions = {userId: ctx.req.accessToken.userId};
+ let tx;
if (typeof options == 'object')
Object.assign(myOptions, options);
@@ -61,18 +60,15 @@ module.exports = Self => {
myOptions.transaction = tx;
}
- const ticketId = args.ticketFk;
- let clientId = args.clientFk;
- let maxShipped = args.maxShipped;
let companyId;
let newInvoice;
let query;
try {
- if (ticketId) {
- const ticket = await models.Ticket.findById(ticketId, null, myOptions);
+ if (ticketFk) {
+ const ticket = await models.Ticket.findById(ticketFk, null, myOptions);
const company = await models.Company.findById(ticket.companyFk, null, myOptions);
- clientId = ticket.clientFk;
+ clientFk = ticket.clientFk;
maxShipped = ticket.shipped;
companyId = ticket.companyFk;
@@ -85,7 +81,7 @@ module.exports = Self => {
throw new UserError(`A ticket with an amount of zero can't be invoiced`);
// Validates ticket nagative base
- const hasNegativeBase = await getNegativeBase(maxShipped, clientId, companyId, myOptions);
+ const hasNegativeBase = await getNegativeBase(maxShipped, clientFk, companyId, myOptions);
if (hasNegativeBase && company.code == 'VNL')
throw new UserError(`A ticket with a negative base can't be invoiced`);
} else {
@@ -95,7 +91,7 @@ module.exports = Self => {
const company = await models.Ticket.findOne({
fields: ['companyFk'],
where: {
- clientFk: clientId,
+ clientFk: clientFk,
shipped: {lte: maxShipped}
}
}, myOptions);
@@ -103,7 +99,7 @@ module.exports = Self => {
}
// Validate invoiceable client
- const isClientInvoiceable = await isInvoiceable(clientId, myOptions);
+ const isClientInvoiceable = await isInvoiceable(clientFk, myOptions);
if (!isClientInvoiceable)
throw new UserError(`This client is not invoiceable`);
@@ -114,27 +110,27 @@ module.exports = Self => {
if (maxShipped >= tomorrow)
throw new UserError(`Can't invoice to future`);
- const maxInvoiceDate = await getMaxIssued(args.serial, companyId, myOptions);
+ const maxInvoiceDate = await getMaxIssued(serial, companyId, myOptions);
if (Date.vnNew() < maxInvoiceDate)
throw new UserError(`Can't invoice to past`);
- if (ticketId) {
+ if (ticketFk) {
query = `CALL invoiceOut_newFromTicket(?, ?, ?, ?, @newInvoiceId)`;
await Self.rawSql(query, [
- ticketId,
- args.serial,
- args.taxArea,
- args.reference
+ ticketFk,
+ serial,
+ taxArea,
+ reference
], myOptions);
} else {
query = `CALL invoiceOut_newFromClient(?, ?, ?, ?, ?, ?, @newInvoiceId)`;
await Self.rawSql(query, [
- clientId,
- args.serial,
+ clientFk,
+ serial,
maxShipped,
companyId,
- args.taxArea,
- args.reference
+ taxArea,
+ reference
], myOptions);
}
@@ -146,26 +142,27 @@ module.exports = Self => {
throw e;
}
- if (newInvoice.id)
- await Self.createPdf(ctx, newInvoice.id);
+ if (!newInvoice.id) throw new UserError('It was not able to create the invoice');
+
+ await Self.createPdf(ctx, newInvoice.id);
return newInvoice;
};
- async function isInvoiceable(clientId, options) {
+ async function isInvoiceable(clientFk, options) {
const models = Self.app.models;
const query = `SELECT (hasToInvoice AND isTaxDataChecked) AS invoiceable
FROM client
WHERE id = ?`;
- const [result] = await models.InvoiceOut.rawSql(query, [clientId], options);
+ const [result] = await models.InvoiceOut.rawSql(query, [clientFk], options);
return result.invoiceable;
}
- async function getNegativeBase(maxShipped, clientId, companyId, options) {
+ async function getNegativeBase(maxShipped, clientFk, companyId, options) {
const models = Self.app.models;
await models.InvoiceOut.rawSql('CALL invoiceOut_exportationFromClient(?,?,?)',
- [maxShipped, clientId, companyId], options
+ [maxShipped, clientFk, companyId], options
);
const query = 'SELECT vn.hasAnyNegativeBase() AS base';
const [result] = await models.InvoiceOut.rawSql(query, [], options);
diff --git a/modules/invoiceOut/back/methods/invoiceOut/download.js b/modules/invoiceOut/back/methods/invoiceOut/download.js
index 24fb9fde3..f8d42072c 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/download.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/download.js
@@ -1,5 +1,6 @@
const fs = require('fs-extra');
const path = require('path');
+const isProduction = require('vn-loopback/server/boot/isProduction');
module.exports = Self => {
Self.remoteMethodCtx('download', {
@@ -32,7 +33,7 @@ module.exports = Self => {
path: '/:id/download',
verb: 'GET'
},
- // accessScopes: ['read:multimedia']
+ accessScopes: ['DEFAULT', 'read:multimedia']
});
Self.download = async function(ctx, id, options) {
@@ -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/downloadZip.js b/modules/invoiceOut/back/methods/invoiceOut/downloadZip.js
index 13305f6ed..8d6e7c6d9 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/downloadZip.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/downloadZip.js
@@ -32,7 +32,7 @@ module.exports = Self => {
path: '/downloadZip',
verb: 'GET'
},
- // accessScopes: ['read:multimedia']
+ accessScopes: ['DEFAULT', 'read:multimedia']
});
Self.downloadZip = async function(ctx, ids, options) {
diff --git a/modules/invoiceOut/back/methods/invoiceOut/exportationPdf.js b/modules/invoiceOut/back/methods/invoiceOut/exportationPdf.js
index a2d877189..6c4845c11 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/exportationPdf.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/exportationPdf.js
@@ -35,7 +35,7 @@ module.exports = Self => {
path: '/:reference/exportation-pdf',
verb: 'GET'
},
- // accessScopes: ['read:multimedia']
+ accessScopes: ['DEFAULT', 'read:multimedia']
});
Self.exportationPdf = (ctx, reference) => Self.printReport(ctx, reference, 'exportation');
diff --git a/modules/invoiceOut/back/methods/invoiceOut/invoiceCsv.js b/modules/invoiceOut/back/methods/invoiceOut/invoiceCsv.js
index 6208d0625..fd754d51b 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/invoiceCsv.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/invoiceCsv.js
@@ -38,7 +38,7 @@ module.exports = Self => {
path: '/:reference/invoice-csv',
verb: 'GET'
},
- // accessScopes: ['read:multimedia']
+ accessScopes: ['DEFAULT', 'read:multimedia']
});
Self.invoiceCsv = async reference => {
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/makePdfAndNotify.js b/modules/invoiceOut/back/methods/invoiceOut/makePdfAndNotify.js
index 4bba2498f..e2dc15993 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/makePdfAndNotify.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/makePdfAndNotify.js
@@ -33,7 +33,6 @@ module.exports = Self => {
try {
await Self.makePdf(id, options);
} catch (err) {
- console.error(err);
throw new UserError('Error while generating PDF', 'pdfError');
}
diff --git a/modules/invoiceOut/back/methods/invoiceOut/negativeBases.js b/modules/invoiceOut/back/methods/invoiceOut/negativeBases.js
index 66440616c..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,
@@ -70,7 +70,7 @@ module.exports = Self => {
c.hasToInvoice,
c.isTaxDataChecked,
w.id comercialId,
- CONCAT(w.firstName, ' ', w.lastName) comercialName
+ u.name workerName
FROM vn.ticket t
JOIN vn.company co ON co.id = t.companyFk
JOIN vn.sale s ON s.ticketFk = t.id
diff --git a/modules/invoiceOut/back/methods/invoiceOut/negativeBasesCsv.js b/modules/invoiceOut/back/methods/invoiceOut/negativeBasesCsv.js
index 6970bf368..3e466d1f4 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/negativeBasesCsv.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/negativeBasesCsv.js
@@ -40,7 +40,7 @@ module.exports = Self => {
path: '/negativeBasesCsv',
verb: 'GET'
},
- // accessScopes: ['read:multimedia']
+ accessScopes: ['DEFAULT', 'read:multimedia']
});
Self.negativeBasesCsv = async(ctx, options) => {
diff --git a/modules/invoiceOut/back/methods/invoiceOut/specs/createManualInvoice.spec.js b/modules/invoiceOut/back/methods/invoiceOut/specs/createManualInvoice.spec.js
index b166caf78..55739e570 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/specs/createManualInvoice.spec.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/specs/createManualInvoice.spec.js
@@ -1,13 +1,10 @@
-const models = require('vn-loopback/server/server').models;
+const {models} = require('vn-loopback/server/server');
const LoopBackContext = require('loopback-context');
describe('InvoiceOut createManualInvoice()', () => {
- const userId = 1;
const ticketId = 16;
const clientId = 1106;
- const activeCtx = {
- accessToken: {userId: userId},
- };
+ const activeCtx = {accessToken: {userId: 1}};
const ctx = {req: activeCtx};
it('should throw an error trying to invoice again', async() => {
@@ -18,13 +15,8 @@ describe('InvoiceOut createManualInvoice()', () => {
let error;
try {
- ctx.args = {
- ticketFk: ticketId,
- serial: 'T',
- taxArea: 'CEE'
- };
- await models.InvoiceOut.createManualInvoice(ctx, options);
- await models.InvoiceOut.createManualInvoice(ctx, options);
+ await createInvoice(ctx, options, undefined, ticketId);
+ await createInvoice(ctx, options, undefined, ticketId);
await tx.rollback();
} catch (e) {
@@ -47,17 +39,9 @@ describe('InvoiceOut createManualInvoice()', () => {
let error;
try {
const ticket = await models.Ticket.findById(ticketId, null, options);
- await ticket.updateAttributes({
- totalWithVat: 0
- }, options);
-
- ctx.args = {
- ticketFk: ticketId,
- serial: 'T',
- taxArea: 'CEE'
- };
- await models.InvoiceOut.createManualInvoice(ctx, options);
+ await ticket.updateAttributes({totalWithVat: 0}, options);
+ await createInvoice(ctx, options, undefined, ticketId);
await tx.rollback();
} catch (e) {
error = e;
@@ -75,13 +59,7 @@ describe('InvoiceOut createManualInvoice()', () => {
let error;
try {
- ctx.args = {
- clientFk: clientId,
- serial: 'T',
- taxArea: 'CEE'
- };
- await models.InvoiceOut.createManualInvoice(ctx, options);
-
+ await createInvoice(ctx, options, clientId);
await tx.rollback();
} catch (e) {
error = e;
@@ -103,16 +81,9 @@ describe('InvoiceOut createManualInvoice()', () => {
let error;
try {
const client = await models.Client.findById(clientId, null, options);
- await client.updateAttributes({
- isTaxDataChecked: false
- }, options);
+ await client.updateAttributes({isTaxDataChecked: false}, options);
- ctx.args = {
- ticketFk: ticketId,
- serial: 'T',
- taxArea: 'CEE'
- };
- await models.InvoiceOut.createManualInvoice(ctx, options);
+ await createInvoice(ctx, options, undefined, ticketId);
await tx.rollback();
} catch (e) {
@@ -130,12 +101,7 @@ describe('InvoiceOut createManualInvoice()', () => {
const options = {transaction: tx};
try {
- ctx.args = {
- ticketFk: ticketId,
- serial: 'T',
- taxArea: 'CEE'
- };
- const result = await models.InvoiceOut.createManualInvoice(ctx, options);
+ const result = await createInvoice(ctx, options, undefined, ticketId);
expect(result.id).toEqual(jasmine.any(Number));
@@ -146,3 +112,18 @@ describe('InvoiceOut createManualInvoice()', () => {
}
});
});
+
+function createInvoice(
+ ctx,
+ options,
+ clientFk = undefined,
+ ticketFk = undefined,
+ maxShipped = undefined,
+ serial = 'T',
+ taxArea = 'CEE',
+ reference = undefined
+) {
+ return models.InvoiceOut.createManualInvoice(
+ ctx, clientFk, ticketFk, maxShipped, serial, taxArea, reference, options
+ );
+}
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 8e234d7cc..0c86e5810 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/transferInvoice.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/transferInvoice.js
@@ -36,9 +36,14 @@ module.exports = Self => {
type: 'number',
required: true
},
+ {
+ arg: 'makeInvoice',
+ type: 'boolean',
+ required: true
+ },
],
returns: {
- type: 'boolean',
+ type: 'object',
root: true
},
http: {
@@ -47,10 +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;
+ let invoiceId;
+ let refundId;
+
let tx;
if (typeof options == 'object')
Object.assign(myOptions, options);
@@ -94,14 +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);
- const [invoiceId] = await models.Ticket.invoiceTicketsAndPdf(ctx, clonedTicketIds, null, myOptions);
+ if (makeInvoice)
+ invoiceId = await models.Ticket.invoiceTickets(ctx, clonedTicketIds, null, myOptions);
- return invoiceId;
+ 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/cplus-rectification-type.json b/modules/invoiceOut/back/models/cplus-rectification-type.json
index e7bfb957f..06a57ea67 100644
--- a/modules/invoiceOut/back/models/cplus-rectification-type.json
+++ b/modules/invoiceOut/back/models/cplus-rectification-type.json
@@ -15,5 +15,13 @@
"description": {
"type": "string"
}
- }
+ },
+ "acls": [
+ {
+ "accessType": "READ",
+ "principalType": "ROLE",
+ "principalId": "$everyone",
+ "permission": "ALLOW"
+ }
+ ]
}
\ No newline at end of file
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/front/descriptor-menu/index.html b/modules/invoiceOut/front/descriptor-menu/index.html
index 1bf34831e..da04c8e72 100644
--- a/modules/invoiceOut/front/descriptor-menu/index.html
+++ b/modules/invoiceOut/front/descriptor-menu/index.html
@@ -1,15 +1,3 @@
-
-
-
-
- {{::description}}
+ {{ ::description}}
@@ -226,7 +214,7 @@
+
+
diff --git a/modules/invoiceOut/front/descriptor-menu/index.js b/modules/invoiceOut/front/descriptor-menu/index.js
index 5184c137e..8ea4507ec 100644
--- a/modules/invoiceOut/front/descriptor-menu/index.js
+++ b/modules/invoiceOut/front/descriptor-menu/index.js
@@ -7,6 +7,7 @@ class Controller extends Section {
super($element, $);
this.vnReport = vnReport;
this.vnEmail = vnEmail;
+ this.checked = true;
}
get invoiceOut() {
@@ -23,6 +24,26 @@ class Controller extends Section {
return this.aclService.hasAny(['invoicing']);
}
+ get isChecked() {
+ return this.checked;
+ }
+
+ set isChecked(value) {
+ this.checked = value;
+ }
+
+ $onInit() {
+ this.$http.get(`CplusRectificationTypes`, {filter: {order: 'description'}})
+ .then(res => {
+ this.cplusRectificationTypes = res.data;
+ this.cplusRectificationType = res.data.filter(type => type.description == 'I – Por diferencias')[0].id;
+ });
+ this.$http.get(`SiiTypeInvoiceOuts`, {filter: {where: {code: {like: 'R%'}}}})
+ .then(res => {
+ this.siiTypeInvoiceOuts = res.data;
+ this.siiTypeInvoiceOut = res.data.filter(type => type.code == 'R4')[0].id;
+ });
+ }
loadData() {
const filter = {
include: [
@@ -34,7 +55,7 @@ class Controller extends Section {
}, {
relation: 'client',
scope: {
- fields: ['id', 'name', 'email']
+ fields: ['id', 'name', 'email', 'hasToInvoiceByAddress']
}
}
]
@@ -136,12 +157,24 @@ class Controller extends Section {
newClientFk: this.clientId,
cplusRectificationTypeFk: this.cplusRectificationType,
siiTypeInvoiceOutFk: this.siiTypeInvoiceOut,
- invoiceCorrectionTypeFk: this.invoiceCorrectionType
+ invoiceCorrectionTypeFk: this.invoiceCorrectionType,
+ makeInvoice: this.checked
};
- this.$http.post(`InvoiceOuts/transferInvoice`, params).then(res => {
- const invoiceId = res.data;
- this.vnApp.showSuccess(this.$t('Transferred invoice'));
- this.$state.go('invoiceOut.card.summary', {id: invoiceId});
+
+ this.$http.get(`Clients/${this.clientId}`).then(response => {
+ const clientData = response.data;
+ const hasToInvoiceByAddress = clientData.hasToInvoiceByAddress;
+
+ if (this.checked && hasToInvoiceByAddress) {
+ if (!window.confirm(this.$t('confirmTransferInvoice')))
+ return;
+ }
+
+ this.$http.post(`InvoiceOuts/transferInvoice`, params).then(res => {
+ const invoiceId = res.data;
+ this.vnApp.showSuccess(this.$t('Transferred invoice'));
+ this.$state.go('invoiceOut.card.summary', {id: invoiceId});
+ });
});
}
}
diff --git a/modules/invoiceOut/front/descriptor-menu/locale/en.yml b/modules/invoiceOut/front/descriptor-menu/locale/en.yml
index 8fad5f25e..32ea03442 100644
--- a/modules/invoiceOut/front/descriptor-menu/locale/en.yml
+++ b/modules/invoiceOut/front/descriptor-menu/locale/en.yml
@@ -1,3 +1,7 @@
The following refund tickets have been created: "The following refund tickets have been created: {{ticketIds}}"
Transfer invoice to...: Transfer invoice to...
-Cplus Type: Cplus Type
\ No newline at end of file
+Cplus Type: Cplus Type
+transferInvoice: Transfer Invoice
+destinationClient: Bill destination client
+transferInvoiceInfo: New tickets from the destination customer will be generated in the default consignee.
+confirmTransferInvoice: Destination customer has marked to bill by consignee, do you want to continue?
\ No newline at end of file
diff --git a/modules/invoiceOut/front/descriptor-menu/locale/es.yml b/modules/invoiceOut/front/descriptor-menu/locale/es.yml
index 9285fafa7..92c109878 100644
--- a/modules/invoiceOut/front/descriptor-menu/locale/es.yml
+++ b/modules/invoiceOut/front/descriptor-menu/locale/es.yml
@@ -24,3 +24,7 @@ Refund...: Abono...
Transfer invoice to...: Transferir factura a...
Rectificative type: Tipo rectificativa
Transferred invoice: Factura transferida
+transferInvoice: Transferir factura
+destinationClient: Facturar cliente destino
+transferInvoiceInfo: Los nuevos tickets del cliente destino serán generados en el consignatario por defecto.
+confirmTransferInvoice: El cliente destino tiene marcado facturar por consignatario, ¿desea continuar?
\ No newline at end of file
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 @@
- {{::client.comercialName | dashIfEmpty}}
+ {{::client.workerName | dashIfEmpty}}
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-image-queue/download.js b/modules/item/back/methods/item-image-queue/download.js
index 354771071..001a2b950 100644
--- a/modules/item/back/methods/item-image-queue/download.js
+++ b/modules/item/back/methods/item-image-queue/download.js
@@ -11,7 +11,7 @@ module.exports = Self => {
path: `/download`,
verb: 'POST',
},
- //accessScopes: ['read:multimedia']
+ accessScopes: ['DEFAULT', 'read:multimedia']
});
Self.download = async() => {
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 8615b7b86..2dd43224c 100644
--- a/modules/item/back/methods/item-shelving/specs/upsertItem.spec.js
+++ b/modules/item/back/methods/item-shelving/specs/upsertItem.spec.js
@@ -1,18 +1,17 @@
-const { models } = require('vn-loopback/server/server');
+const {models} = require('vn-loopback/server/server');
const LoopBackContext = require('loopback-context');
-// #6276
describe('ItemShelving upsertItem()', () => {
const warehouseFk = 1;
let ctx;
let options;
let tx;
- beforeEach(async () => {
+ beforeEach(async() => {
ctx = {
req: {
- accessToken: { userId: 9 },
- headers: { origin: 'http://localhost' }
+ accessToken: {userId: 9},
+ headers: {origin: 'http://localhost'}
},
args: {}
};
@@ -21,35 +20,35 @@ describe('ItemShelving upsertItem()', () => {
active: ctx.req
});
- options = { transaction: tx };
+ options = {transaction: tx};
tx = await models.ItemShelving.beginTransaction({});
options.transaction = tx;
});
- afterEach(async () => {
+ afterEach(async() => {
await tx.rollback();
});
- it('should add two new records', async () => {
- const shelvingFk = 'ZPP';
+ it('should add two new records', async() => {
+ const shelvingFk = 'GVC';
const items = [1, 1, 1, 2];
await models.ItemShelving.upsertItem(ctx, shelvingFk, items, warehouseFk, options);
- const itemShelvings = await models.ItemShelving.find({ where: { shelvingFk } }, options);
+ const itemShelvings = await models.ItemShelving.find({where: {shelvingFk}}, options);
expect(itemShelvings.length).toEqual(2);
});
- it('should update the visible items', async () => {
+ it('should update the visible items', async() => {
const shelvingFk = 'GVC';
const items = [2, 2];
- const { visible: visibleItemsBefore } = await models.ItemShelving.findOne({
- where: { shelvingFk, itemFk: items[0] }
+ const {visible: visibleItemsBefore} = await models.ItemShelving.findOne({
+ where: {shelvingFk, itemFk: items[0]}
}, options);
await models.ItemShelving.upsertItem(ctx, shelvingFk, items, warehouseFk, options);
- const { visible: visibleItemsAfter } = await models.ItemShelving.findOne({
- where: { shelvingFk, itemFk: items[0] }
+ const {visible: visibleItemsAfter} = await models.ItemShelving.findOne({
+ where: {shelvingFk, itemFk: items[0]}
}, options);
expect(visibleItemsAfter).toEqual(visibleItemsBefore + 2);
diff --git a/modules/item/back/methods/item/getBalance.js b/modules/item/back/methods/item/getBalance.js
index d4e2d0f74..207f8020f 100644
--- a/modules/item/back/methods/item/getBalance.js
+++ b/modules/item/back/methods/item/getBalance.js
@@ -27,8 +27,11 @@ module.exports = Self => {
const where = filter.where;
const query = 'CALL vn.item_getBalance(?, ?, ?)';
+ if (where?.date) {
+ where.date = new Date(where.date);
+ where.date.setHours(0, 0, 0, 0);
+ }
const [diary] = await Self.rawSql(query, [where.itemFk, where.warehouseFk, where.date], myOptions);
-
for (const entry of diary)
if (entry.clientType === 'loses') entry.highlighted = true;
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/getBalance.spec.js b/modules/item/back/methods/item/specs/getBalance.spec.js
index 5e5148595..728b5f33e 100644
--- a/modules/item/back/methods/item/specs/getBalance.spec.js
+++ b/modules/item/back/methods/item/specs/getBalance.spec.js
@@ -64,7 +64,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/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.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/last-entries/index.html b/modules/item/front/last-entries/index.html
index 429955ef5..e3b84655c 100644
--- a/modules/item/front/last-entries/index.html
+++ b/modules/item/front/last-entries/index.html
@@ -71,12 +71,12 @@
{{entry.stickers | dashIfEmpty}}
-
+
{{::entry.packing | dashIfEmpty}}
-
+
{{::entry.grouping | dashIfEmpty}}
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/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/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/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/route/cmr.js b/modules/route/back/methods/route/cmr.js
index cd7ef57ce..5033dee2f 100644
--- a/modules/route/back/methods/route/cmr.js
+++ b/modules/route/back/methods/route/cmr.js
@@ -29,7 +29,8 @@ module.exports = Self => {
http: {
path: '/:id/cmr',
verb: 'GET'
- }
+ },
+ accessScopes: ['DEFAULT', 'read:multimedia']
});
Self.cmr = (ctx, id) => Self.printReport(ctx, id, 'cmr');
diff --git a/modules/route/back/methods/route/downloadCmrsZip.js b/modules/route/back/methods/route/downloadCmrsZip.js
index 1ef25d175..c6934edca 100644
--- a/modules/route/back/methods/route/downloadCmrsZip.js
+++ b/modules/route/back/methods/route/downloadCmrsZip.js
@@ -30,7 +30,7 @@ module.exports = Self => {
path: '/downloadCmrsZip',
verb: 'GET'
},
- //accessScopes: ['read:multimedia']
+ accessScopes: ['DEFAULT', 'read:multimedia']
});
Self.downloadCmrsZip = async function(ctx, ids, options) {
diff --git a/modules/route/back/methods/route/downloadZip.js b/modules/route/back/methods/route/downloadZip.js
index b226cf7f8..8eecf62e4 100644
--- a/modules/route/back/methods/route/downloadZip.js
+++ b/modules/route/back/methods/route/downloadZip.js
@@ -30,7 +30,7 @@ module.exports = Self => {
path: '/downloadZip',
verb: 'GET'
},
- //accessScopes: ['read:multimedia']
+ accessScopes: ['DEFAULT', 'read:multimedia']
});
Self.downloadZip = async function(ctx, id, options) {
diff --git a/modules/route/back/methods/route/driverRoutePdf.js b/modules/route/back/methods/route/driverRoutePdf.js
index 9469356bb..69b26d846 100644
--- a/modules/route/back/methods/route/driverRoutePdf.js
+++ b/modules/route/back/methods/route/driverRoutePdf.js
@@ -35,7 +35,7 @@ module.exports = Self => {
path: '/:id/driver-route-pdf',
verb: 'GET'
},
- //accessScopes: ['read:multimedia']
+ accessScopes: ['DEFAULT', 'read:multimedia']
});
diff --git a/modules/route/back/methods/route/filter.js b/modules/route/back/methods/route/filter.js
index 7c2225dc9..5b13a9004 100644
--- a/modules/route/back/methods/route/filter.js
+++ b/modules/route/back/methods/route/filter.js
@@ -67,6 +67,12 @@ module.exports = Self => {
type: 'string',
description: 'The description filter',
http: {source: 'query'}
+ },
+ {
+ arg: 'isOk',
+ type: 'boolean',
+ description: 'The isOk filter',
+ http: {source: 'query'}
}
],
returns: {
@@ -102,6 +108,8 @@ module.exports = Self => {
case 'agencyModeFk':
param = `r.${param}`;
return {[param]: value};
+ case 'isOk':
+ return {'r.isOk': value};
}
});
diff --git a/modules/route/back/methods/route/getExpeditionSummary.js b/modules/route/back/methods/route/getExpeditionSummary.js
index ee89401a8..2bd2ca43a 100644
--- a/modules/route/back/methods/route/getExpeditionSummary.js
+++ b/modules/route/back/methods/route/getExpeditionSummary.js
@@ -49,8 +49,7 @@ module.exports = Self => {
JOIN vn.agencyMode am ON am.id = r.agencyModeFk
JOIN vn.agency ag ON ag.id = am.agencyFk
LEFT JOIN vn.userConfig uc ON uc.userFk = account.myUser_getId()
- WHERE (r.created = util.VN_CURDATE() OR r.created = util.yesterday())
- AND t.routeFk = ?
+ WHERE t.routeFk = ?
GROUP BY t.addressFk, e.itemPackingTypeFk
) sub
GROUP BY addressFk
diff --git a/modules/route/back/methods/route/getExternalCmrs.js b/modules/route/back/methods/route/getExternalCmrs.js
index b8cd1041a..89536f50a 100644
--- a/modules/route/back/methods/route/getExternalCmrs.js
+++ b/modules/route/back/methods/route/getExternalCmrs.js
@@ -103,7 +103,7 @@ 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
diff --git a/modules/route/back/methods/route/getTickets.js b/modules/route/back/methods/route/getTickets.js
index 59ba389ed..c0b952b70 100644
--- a/modules/route/back/methods/route/getTickets.js
+++ b/modules/route/back/methods/route/getTickets.js
@@ -33,60 +33,60 @@ module.exports = Self => {
const stmt = new ParameterizedSQL(
`SELECT
- t.id,
- t.packages,
- t.warehouseFk,
- t.nickname,
- t.clientFk,
- t.priority,
- t.addressFk,
- st.code ticketStateCode,
- st.name ticketStateName,
- wh.name warehouseName,
- tob.description ticketObservation,
- a.street,
- a.postalCode,
- a.city,
- am.name agencyModeName,
- u.nickname userNickname,
- vn.ticketTotalVolume(t.id) volume,
- tob.description,
- GROUP_CONCAT(DISTINCT i.itemPackingTypeFk ORDER BY i.itemPackingTypeFk) ipt,
- c.phone clientPhone,
- c.mobile clientMobile,
- a.phone addressPhone,
- a.mobile addressMobile,
- a.longitude,
- a.latitude,
- wm.mediaValue salePersonPhone,
- t.cmrFk,
- t.isSigned signed
- FROM vn.route r
- JOIN ticket t ON t.routeFk = r.id
- JOIN client c ON t.clientFk = c.id
- LEFT JOIN vn.sale s ON s.ticketFk = t.id
- LEFT JOIN vn.item i ON i.id = s.itemFk
- LEFT JOIN ticketState ts ON ts.ticketFk = t.id
- LEFT JOIN state st ON st.id = ts.stateFk
- LEFT JOIN warehouse wh ON wh.id = t.warehouseFk
- LEFT JOIN observationType ot ON ot.code = 'delivery'
- LEFT JOIN ticketObservation tob ON tob.ticketFk = t.id
- AND tob.observationTypeFk = ot.id
- LEFT JOIN address a ON a.id = t.addressFk
- LEFT JOIN agencyMode am ON am.id = t.agencyModeFk
- LEFT JOIN account.user u ON u.id = r.workerFk
- LEFT JOIN vehicle v ON v.id = r.vehicleFk
- LEFT JOIN workerMedia wm ON wm.workerFk = c.salesPersonFk`
+ t.id,
+ t.packages,
+ t.warehouseFk,
+ t.nickname,
+ t.clientFk,
+ t.priority,
+ t.addressFk,
+ st.code ticketStateCode,
+ st.name ticketStateName,
+ wh.name warehouseName,
+ tob.description observationDelivery,
+ tob2.description observationDropOff,
+ tob2.id observationId,
+ a.street,
+ a.postalCode,
+ a.city,
+ am.name agencyModeName,
+ u.nickname userNickname,
+ vn.ticketTotalVolume(t.id) volume,
+ GROUP_CONCAT(DISTINCT i.itemPackingTypeFk ORDER BY i.itemPackingTypeFk) ipt,
+ c.phone clientPhone,
+ c.mobile clientMobile,
+ a.phone addressPhone,
+ a.mobile addressMobile,
+ a.longitude,
+ a.latitude,
+ wm.mediaValue salePersonPhone,
+ t.cmrFk,
+ t.isSigned signed
+ FROM vn.route r
+ JOIN ticket t ON t.routeFk = r.id
+ JOIN client c ON t.clientFk = c.id
+ LEFT JOIN vn.sale s ON s.ticketFk = t.id
+ LEFT JOIN vn.item i ON i.id = s.itemFk
+ LEFT JOIN ticketState ts ON ts.ticketFk = t.id
+ LEFT JOIN state st ON st.id = ts.stateFk
+ LEFT JOIN warehouse wh ON wh.id = t.warehouseFk
+ LEFT JOIN observationType ot ON ot.code = 'delivery'
+ LEFT JOIN ticketObservation tob ON tob.ticketFk = t.id
+ AND tob.observationTypeFk = ot.id
+ LEFT JOIN observationType ot2 ON ot2.code = 'dropOff'
+ LEFT JOIN ticketObservation tob2 ON tob2.ticketFk = t.id
+ AND tob2.observationTypeFk = ot2.id
+ LEFT JOIN address a ON a.id = t.addressFk
+ LEFT JOIN agencyMode am ON am.id = t.agencyModeFk
+ LEFT JOIN account.user u ON u.id = r.workerFk
+ LEFT JOIN vehicle v ON v.id = r.vehicleFk
+ LEFT JOIN workerMedia wm ON wm.workerFk = c.salesPersonFk`
);
if (!filter.where) filter.where = {};
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/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..01572d718 100644
--- a/modules/route/back/models/roadmap.json
+++ b/modules/route/back/models/roadmap.json
@@ -54,9 +54,9 @@
"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/expedition-truck.json b/modules/route/back/models/roadmapStop.json
similarity index 78%
rename from modules/route/back/models/expedition-truck.json
rename to modules/route/back/models/roadmapStop.json
index 8edc7347f..74b02cd7a 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": {
@@ -34,10 +34,10 @@
"model": "Roadmap",
"foreignKey": "roadmapFk"
},
- "warehouse": {
+ "address": {
"type": "belongsTo",
- "model": "Warehouse",
- "foreignKey": "warehouseFk"
+ "model": "Address",
+ "foreignKey": "addressFk"
}
}
}
diff --git a/modules/route/back/models/routesMonitor.json b/modules/route/back/models/routesMonitor.json
index 122026336..a14680b5c 100644
--- a/modules/route/back/models/routesMonitor.json
+++ b/modules/route/back/models/routesMonitor.json
@@ -48,9 +48,6 @@
"priority": {
"type": "number"
},
- "expeditionTruckFk": {
- "type": "number"
- },
"m3boxes": {
"type": "number"
},
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/route/front/summary/index.html b/modules/route/front/summary/index.html
index 56f7a49b9..8269bf118 100644
--- a/modules/route/front/summary/index.html
+++ b/modules/route/front/summary/index.html
@@ -81,7 +81,7 @@
City
PC
Client
- Warehouse
+ State
Packages
m³
Packaging
@@ -109,7 +109,7 @@
{{ticket.nickname}}
- {{ticket.warehouseName}}
+ {{ticket.ticketStateName}}
{{ticket.packages}}
{{ticket.volume}}
{{ticket.ipt}}
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/shelving/front/basic-data/index.html b/modules/shelving/front/basic-data/index.html
deleted file mode 100644
index 68d61e169..000000000
--- a/modules/shelving/front/basic-data/index.html
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/modules/shelving/front/basic-data/index.js b/modules/shelving/front/basic-data/index.js
deleted file mode 100644
index e17c9feee..000000000
--- a/modules/shelving/front/basic-data/index.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import ngModule from '../module';
-import Section from 'salix/components/section';
-
-ngModule.vnComponent('vnShelvingBasicData', {
- template: require('./index.html'),
- controller: Section,
- bindings: {
- shelving: '<'
- }
-});
diff --git a/modules/shelving/front/card/index.html b/modules/shelving/front/card/index.html
deleted file mode 100644
index c83afc288..000000000
--- a/modules/shelving/front/card/index.html
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/shelving/front/create/index.js b/modules/shelving/front/create/index.js
deleted file mode 100644
index bb0e441eb..000000000
--- a/modules/shelving/front/create/index.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import ngModule from '../module';
-import Section from 'salix/components/section';
-
-export default class Controller extends Section {
- onSubmit() {
- return this.$.watcher.submit().then(res =>
- this.$state.go('shelving.card.basicData', {id: res.data.id})
- );
- }
-}
-
-ngModule.vnComponent('vnShelvingCreate', {
- template: require('./index.html'),
- controller: Controller
-});
diff --git a/modules/shelving/front/create/index.spec.js b/modules/shelving/front/create/index.spec.js
deleted file mode 100644
index 0bdde9145..000000000
--- a/modules/shelving/front/create/index.spec.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import './index';
-
-describe('Shelving', () => {
- describe('Component vnShelvingCreate', () => {
- let $scope;
- let $state;
- let controller;
-
- beforeEach(ngModule('shelving'));
-
- beforeEach(inject(($componentController, $rootScope, _$state_) => {
- $scope = $rootScope.$new();
- $state = _$state_;
- $scope.watcher = {
- submit: () => {
- return {
- then: callback => {
- callback({data: {id: 1}});
- }
- };
- }
- };
- const $element = angular.element('
-
-
- Delete shelving
-
-
-
-
-
-
-
-
-
-
-
diff --git a/modules/shelving/front/descriptor/index.js b/modules/shelving/front/descriptor/index.js
deleted file mode 100644
index 931dbb6dc..000000000
--- a/modules/shelving/front/descriptor/index.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import ngModule from '../module';
-import Descriptor from 'salix/components/descriptor';
-
-class Controller extends Descriptor {
- get shelving() {
- return this.entity;
- }
-
- set shelving(value) {
- this.entity = value;
- }
-
- onDelete() {
- return this.$http.delete(`Shelvings/${this.shelving.id}`)
- .then(() => this.$state.go('shelving.index'))
- .then(() => this.vnApp.showSuccess(this.$t('Shelving removed')));
- }
-}
-
-ngModule.vnComponent('vnShelvingDescriptor', {
- template: require('./index.html'),
- controller: Controller,
- bindings: {
- shelving: '<'
- }
-});
diff --git a/modules/shelving/front/descriptor/index.spec.js b/modules/shelving/front/descriptor/index.spec.js
deleted file mode 100644
index 3ee33580b..000000000
--- a/modules/shelving/front/descriptor/index.spec.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import './index.js';
-
-describe('component vnShelvingDescriptor', () => {
- let $httpBackend;
- let controller;
-
- const shelving = {id: 1, code: 'AA6'};
-
- beforeEach(ngModule('shelving'));
-
- beforeEach(inject(($componentController, _$httpBackend_, _$httpParamSerializer_) => {
- $httpBackend = _$httpBackend_;
- controller = $componentController('vnShelvingDescriptor', {$element: null}, {shelving});
- jest.spyOn(controller.vnApp, 'showSuccess');
- }));
-
- describe('onDelete()', () => {
- it('should delete entity and go to index', () => {
- controller.$state.go = jest.fn();
-
- $httpBackend.expectDELETE('Shelvings/1').respond();
- controller.onDelete();
- $httpBackend.flush();
-
- expect(controller.$state.go).toHaveBeenCalledWith('shelving.index');
- expect(controller.vnApp.showSuccess).toHaveBeenCalled();
- });
- });
-});
diff --git a/modules/shelving/front/descriptor/locale/es.yml b/modules/shelving/front/descriptor/locale/es.yml
deleted file mode 100644
index e7fafc320..000000000
--- a/modules/shelving/front/descriptor/locale/es.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-Delete shelving: Eliminar carro
-Shelving will be removed: El carro será eliminado
-Shelving removed: Carro eliminado
diff --git a/modules/shelving/front/index.js b/modules/shelving/front/index.js
index 2ad9bc1b9..a7209a0bd 100644
--- a/modules/shelving/front/index.js
+++ b/modules/shelving/front/index.js
@@ -1,11 +1,3 @@
export * from './module';
-import './basic-data';
-import './card';
-import './create';
-import './descriptor';
-import './index/';
import './main';
-import './search-panel';
-import './summary';
-import './log';
diff --git a/modules/shelving/front/index/index.html b/modules/shelving/front/index/index.html
deleted file mode 100644
index 1532abd42..000000000
--- a/modules/shelving/front/index/index.html
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{$ctrl.summary.worker.user.nickname}}
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/shelving/front/summary/index.js b/modules/shelving/front/summary/index.js
deleted file mode 100644
index 91f8e2aa7..000000000
--- a/modules/shelving/front/summary/index.js
+++ /dev/null
@@ -1,41 +0,0 @@
-import ngModule from '../module';
-import Summary from 'salix/components/summary';
-import './style.scss';
-
-class Controller extends Summary {
- set shelving(value) {
- this._shelving = value;
- this.summary = null;
- if (!value) return;
-
- const filter = {
- include: [
- {relation: 'worker',
- scope: {
- fields: ['id'],
- include: {
- relation: 'user',
- scope: {
- fields: ['nickname']
- }
- }
- }},
- {relation: 'parking'}
- ]
- };
- this.$http.get(`Shelvings/${value.id}`, {filter})
- .then(res => this.summary = res.data);
- }
-
- get shelving() {
- return this._shelving;
- }
-}
-
-ngModule.vnComponent('vnShelvingSummary', {
- template: require('./index.html'),
- controller: Controller,
- bindings: {
- shelving: '<'
- }
-});
diff --git a/modules/shelving/front/summary/locale/es.yml b/modules/shelving/front/summary/locale/es.yml
deleted file mode 100644
index d5d14d52a..000000000
--- a/modules/shelving/front/summary/locale/es.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-Code: Código
-Parking: Parking
-Priority: Prioridad
-Worker: Trabajador
-Recyclable: Reciclable
\ No newline at end of file
diff --git a/modules/shelving/front/summary/style.scss b/modules/shelving/front/summary/style.scss
deleted file mode 100644
index 1eb6b2323..000000000
--- a/modules/shelving/front/summary/style.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-@import "variables";
-
-vn-client-summary {
- .alert span {
- color: $color-alert
- }
-}
\ No newline at end of file
diff --git a/modules/supplier/back/methods/supplier/campaignMetricsPdf.js b/modules/supplier/back/methods/supplier/campaignMetricsPdf.js
index 55767e9c6..58282747d 100644
--- a/modules/supplier/back/methods/supplier/campaignMetricsPdf.js
+++ b/modules/supplier/back/methods/supplier/campaignMetricsPdf.js
@@ -45,7 +45,7 @@ module.exports = Self => {
path: '/:id/campaign-metrics-pdf',
verb: 'GET'
},
- // accessScopes: ['read:multimedia']
+ accessScopes: ['DEFAULT', 'read:multimedia']
});
Self.campaignMetricsPdf = (ctx, id) => Self.printReport(ctx, id, 'supplier-campaign-metrics');
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/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/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/sale/clone.js b/modules/ticket/back/methods/sale/clone.js
index 77c40d8a0..fa1079fbe 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;
diff --git a/modules/ticket/back/methods/ticket-observation/addDropOff.js b/modules/ticket/back/methods/ticket-observation/addDropOff.js
new file mode 100644
index 000000000..5f773f593
--- /dev/null
+++ b/modules/ticket/back/methods/ticket-observation/addDropOff.js
@@ -0,0 +1,42 @@
+
+module.exports = Self => {
+ Self.remoteMethod('addDropOff', {
+ description: 'Add a dropOff note in a ticket',
+ accessType: 'WRITE',
+ accepts: [{
+ arg: 'ticketFk',
+ type: 'number',
+ required: true,
+ description: 'ticket ID'
+ }, {
+ arg: 'note',
+ type: 'string',
+ required: true,
+ description: 'note text'
+ }],
+
+ http: {
+ path: `/addDropOff`,
+ verb: 'post'
+ }
+ });
+
+ Self.addDropOff = async(ticketFk, note, options) => {
+ const models = Self.app.models;
+ const myOptions = {};
+
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
+
+ const observationTypeDropOff = await models.ObservationType.findOne({
+ where: {code: 'dropOff'}
+ }, myOptions);
+
+ await models.TicketObservation.create({
+ ticketFk: ticketFk,
+ observationTypeFk: observationTypeDropOff.id,
+ description: note
+
+ }, myOptions);
+ };
+};
diff --git a/modules/ticket/back/methods/ticket-observation/specs/addDropOff.spec.js b/modules/ticket/back/methods/ticket-observation/specs/addDropOff.spec.js
new file mode 100644
index 000000000..82c692946
--- /dev/null
+++ b/modules/ticket/back/methods/ticket-observation/specs/addDropOff.spec.js
@@ -0,0 +1,31 @@
+const {models} = require('vn-loopback/server/server');
+
+describe('ticketObservation addDropOff()', () => {
+ const ticketFk = 5;
+ const note = 'DropOff note';
+ const code = 'dropOff';
+
+ it('should return a dropOff note', async() => {
+ const tx = await models.TicketObservation.beginTransaction({});
+
+ try {
+ const options = {transaction: tx};
+ await models.TicketObservation.addDropOff(
+ ticketFk, note, options);
+
+ const observationTypeDropOff = await models.TicketObservation.find({
+ where: {
+ ticketFk,
+ code
+ }
+ }, options);
+
+ expect(observationTypeDropOff.length).toEqual(1);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+});
diff --git a/modules/ticket/back/methods/ticket-request/confirm.js b/modules/ticket/back/methods/ticket-request/confirm.js
index 00310f33c..7c17d0010 100644
--- a/modules/ticket/back/methods/ticket-request/confirm.js
+++ b/modules/ticket/back/methods/ticket-request/confirm.js
@@ -19,6 +19,9 @@ module.exports = Self => {
type: 'number',
required: true,
description: 'The requested item quantity',
+ }, {
+ arg: 'attenderFk',
+ type: 'number'
}],
returns: {
type: 'object',
@@ -73,12 +76,14 @@ module.exports = Self => {
ticketFk: request.ticketFk,
itemFk: ctx.args.itemFk,
quantity: ctx.args.quantity,
+ attenderFk: ctx.args.attenderFk,
concept: item.name
}, myOptions);
await request.updateAttributes({
saleFk: sale.id,
itemFk: sale.itemFk,
- isOk: true
+ isOk: true,
+ attenderFk: sale.attenderFk,
}, myOptions);
const query = `CALL vn.sale_calculateComponent(?, NULL)`;
diff --git a/modules/ticket/back/methods/ticket-request/filter.js b/modules/ticket/back/methods/ticket-request/filter.js
index 10aaf02e5..5364cef9a 100644
--- a/modules/ticket/back/methods/ticket-request/filter.js
+++ b/modules/ticket/back/methods/ticket-request/filter.js
@@ -1,4 +1,3 @@
-
const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
const buildFilter = require('vn-loopback/util/filter').buildFilter;
const mergeFilters = require('vn-loopback/util/filter').mergeFilters;
@@ -135,7 +134,8 @@ module.exports = Self => {
tr.requesterFk,
tr.isOk,
s.quantity saleQuantity,
- s.itemFk,
+ s.itemFk saleItemFk,
+ i.id itemFk,
i.name itemDescription,
t.shipped,
DATE(t.shipped) shippedDate,
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 de2817d87..668a991f4 100644
--- a/modules/ticket/back/methods/ticket-request/specs/confirm.spec.js
+++ b/modules/ticket/back/methods/ticket-request/specs/confirm.spec.js
@@ -92,9 +92,7 @@ describe('ticket-request confirm()', () => {
const request = await models.TicketRequest.findById(requestId, null, options);
expect(request.saleFk).toBeNull();
-
- await request.updateAttributes({saleFk: 2}, options);
-
+ await request.updateAttributes({saleFk: 2});
ctx.args = {
itemFk: itemId,
id: requestId,
@@ -102,7 +100,6 @@ describe('ticket-request confirm()', () => {
};
await models.TicketRequest.confirm(ctx, options);
-
await tx.rollback();
} catch (e) {
await tx.rollback();
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 a73628c86..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 = {};
- 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/componentUpdate.js b/modules/ticket/back/methods/ticket/componentUpdate.js
index 0786b72c8..8bea731b7 100644
--- a/modules/ticket/back/methods/ticket/componentUpdate.js
+++ b/modules/ticket/back/methods/ticket/componentUpdate.js
@@ -150,7 +150,7 @@ module.exports = Self => {
const salesNewTicket = salesMovable.filter(sale => (sale.movable ? sale.movable : 0) >= sale.quantity);
const salesNewTicketLength = salesNewTicket.length;
- if (salesNewTicketLength && sales.length != salesNewTicketLength) {
+ if (salesNewTicketLength && (args.newTicket || sales.length != salesNewTicketLength)) {
const newTicket = await models.Ticket.transferSales(
ctx,
args.id,
diff --git a/modules/ticket/back/methods/ticket/deliveryNoteCsv.js b/modules/ticket/back/methods/ticket/deliveryNoteCsv.js
index 29a859842..f02debba8 100644
--- a/modules/ticket/back/methods/ticket/deliveryNoteCsv.js
+++ b/modules/ticket/back/methods/ticket/deliveryNoteCsv.js
@@ -38,7 +38,7 @@ module.exports = Self => {
path: '/:id/delivery-note-csv',
verb: 'GET'
},
- //accessScopes: ['read:multimedia']
+ accessScopes: ['DEFAULT', 'read:multimedia']
});
Self.deliveryNoteCsv = async id => {
diff --git a/modules/ticket/back/methods/ticket/deliveryNotePdf.js b/modules/ticket/back/methods/ticket/deliveryNotePdf.js
index 6155ff81e..205f4ba7b 100644
--- a/modules/ticket/back/methods/ticket/deliveryNotePdf.js
+++ b/modules/ticket/back/methods/ticket/deliveryNotePdf.js
@@ -42,7 +42,7 @@ module.exports = Self => {
path: '/:id/delivery-note-pdf',
verb: 'GET'
},
- //accessScopes: ['read:multimedia']
+ accessScopes: ['DEFAULT', 'read:multimedia']
});
Self.deliveryNotePdf = (ctx, id) => Self.printReport(ctx, id, 'delivery-note');
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/priceDifference.js b/modules/ticket/back/methods/ticket/priceDifference.js
index 7dc85bd3d..7db03e268 100644
--- a/modules/ticket/back/methods/ticket/priceDifference.js
+++ b/modules/ticket/back/methods/ticket/priceDifference.js
@@ -118,7 +118,7 @@ module.exports = Self => {
const [salesMovable] = await Self.rawSql(query, params, myOptions);
const itemMovable = new Map();
- for (sale of salesMovable) {
+ for (let sale of salesMovable) {
const saleMovable = sale.movable ? sale.movable : 0;
itemMovable.set(sale.id, saleMovable);
}
@@ -129,7 +129,7 @@ module.exports = Self => {
const [difComponents] = await Self.rawSql(query, params, myOptions);
const map = new Map();
- for (difComponent of difComponents)
+ for (let difComponent of difComponents)
map.set(difComponent.saleFk, difComponent);
for (sale of salesObj.items) {
diff --git a/modules/ticket/back/methods/ticket/saveSign.js b/modules/ticket/back/methods/ticket/saveSign.js
index 490b05320..b5c662089 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(?, ?)`, [params.ticketFk, params.code], 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/filter.spec.js b/modules/ticket/back/methods/ticket/specs/filter.spec.js
index e495a41f5..8008acfaf 100644
--- a/modules/ticket/back/methods/ticket/specs/filter.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/filter.spec.js
@@ -68,7 +68,7 @@ describe('ticket filter()', () => {
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) {
diff --git a/modules/ticket/back/methods/ticket/specs/priceDifference.spec.js b/modules/ticket/back/methods/ticket/specs/priceDifference.spec.js
index d01f0c1bb..7dc1c8ed2 100644
--- a/modules/ticket/back/methods/ticket/specs/priceDifference.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/priceDifference.spec.js
@@ -1,5 +1,4 @@
const models = require('vn-loopback/server/server').models;
-const UserError = require('vn-loopback/util/user-error');
const ForbiddenError = require('vn-loopback/util/forbiddenError');
describe('sale priceDifference()', () => {
@@ -43,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(),
@@ -83,12 +82,10 @@ describe('sale priceDifference()', () => {
warehouseId: 1
};
- const result = await models.Ticket.priceDifference(ctx, options);
- const firstItem = result.items[0];
- const secondtItem = result.items[1];
+ const {items} = await models.Ticket.priceDifference(ctx, options);
- expect(firstItem.movable).toEqual(380);
- expect(secondtItem.movable).toEqual(1790);
+ expect(items[0].movable).toEqual(386);
+ expect(items[1].movable).toEqual(1810);
await tx.rollback();
} catch (e) {
diff --git a/modules/ticket/back/methods/ticket/specs/setDeleted.spec.js b/modules/ticket/back/methods/ticket/specs/setDeleted.spec.js
index 520a9e403..cb2a21d91 100644
--- a/modules/ticket/back/methods/ticket/specs/setDeleted.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/setDeleted.spec.js
@@ -49,7 +49,7 @@ describe('ticket setDeleted()', () => {
ctx.req.__ = value => {
return value;
};
- const ticketId = 23;
+ const ticketId = 24;
const [sectorCollectionBefore] = await models.Ticket.rawSql(
`SELECT COUNT(*) numberRows
FROM vn.sectorCollection`, [], options);
@@ -87,7 +87,7 @@ describe('ticket setDeleted()', () => {
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);
diff --git a/modules/ticket/back/methods/ticket/specs/state.spec.js b/modules/ticket/back/methods/ticket/specs/state.spec.js
index 947e72b79..d908aa2ef 100644
--- a/modules/ticket/back/methods/ticket/specs/state.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/state.spec.js
@@ -7,6 +7,7 @@ describe('ticket state()', () => {
const productionId = 49;
const activeCtx = {
accessToken: {userId: 9},
+ __: value => value
};
const ctx = {req: activeCtx};
const now = Date.vnNew();
@@ -88,7 +89,8 @@ describe('ticket state()', () => {
const ticket = await models.Ticket.create(sampleTicket, options);
activeCtx.accessToken.userId = productionId;
- const params = {ticketFk: ticket.id, stateFk: 3};
+ 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);
@@ -112,16 +114,68 @@ describe('ticket state()', () => {
const options = {transaction: tx};
const ticket = await models.Ticket.create(sampleTicket, options);
- const ctx = {req: {accessToken: {userId: 18}}};
+ activeCtx.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();
+
+ activeCtx.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);
+ activeCtx.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();
+
+ activeCtx.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) {
diff --git a/modules/ticket/back/methods/ticket/state.js b/modules/ticket/back/methods/ticket/state.js
index fea9475f8..9b0b862f2 100644
--- a/modules/ticket/back/methods/ticket/state.js
+++ b/modules/ticket/back/methods/ticket/state.js
@@ -64,7 +64,63 @@ module.exports = Self => {
if ((ticketState && !oldStateAllowed) || !newStateAllowed)
throw new UserError(`You don't have enough privileges`, 'ACCESS_DENIED');
- await Self.rawSql(`CALL vn.ticket_setState(?, ?)`, [params.ticketFk, params.code], myOptions);
+ const ticket = await models.Ticket.findById(params.ticketFk, {
+ include: [{
+ relation: 'client',
+ scope: {
+ fields: ['salesPersonFk']
+ }
+ }],
+ fields: ['id', 'clientFk']
+ }, myOptions);
+
+ const salesPersonFk = ticket.client().salesPersonFk;
+ if (salesPersonFk) {
+ const sales = await Self.rawSql(`
+ SELECT DISTINCT s.id,
+ s.itemFk,
+ s.concept,
+ s.originalQuantity AS oldQuantity,
+ s.quantity AS newQuantity
+ FROM vn.sale s
+ JOIN vn.saleTracking st ON st.saleFk = s.id
+ JOIN vn.ticket t ON t.id = s.ticketFk
+ JOIN vn.client c ON c.id = t.clientFk
+ JOIN vn.ticketState ts ON ts.ticketFk = t.id
+ JOIN vn.state s2 ON s2.id = ts.stateFk
+ WHERE s.ticketFk = ?
+ AND st.isChecked
+ AND s.originalQuantity IS NOT NULL
+ AND s.originalQuantity <> s.quantity
+ AND s2.\`order\` < (SELECT \`order\` FROM vn.state WHERE code = 'CHECKED')
+ ORDER BY st.created DESC
+ `, [params.ticketFk], myOptions);
+
+ let changes = '';
+ const url = await models.Url.getUrl();
+ const $t = ctx.req.__;
+ for (let sale of sales) {
+ changes += `\r\n-` + $t('Changes in sales', {
+ itemId: sale.itemFk,
+ concept: sale.concept,
+ oldQuantity: sale.oldQuantity,
+ newQuantity: sale.newQuantity,
+ itemUrl: `${url}item/${sale.itemFk}/summary`
+ });
+ const currentSale = await models.Sale.findById(sale.id, null, myOptions);
+ await currentSale.updateAttributes({
+ originalQuantity: currentSale.quantity
+ }, myOptions);
+ }
+
+ const message = $t('Changed sale quantity', {
+ ticketId: ticket.id,
+ changes: changes,
+ ticketUrl: `${url}ticket/${ticket.id}/sale`
+ });
+ await models.Chat.sendCheckingPresence(ctx, salesPersonFk, message, myOptions);
+ }
+ await Self.rawSql(`CALL vn.ticket_setState(?, ?)`, [ticket.id, params.code], myOptions);
const ticketTracking = await models.TicketTracking.findOne({
where: {ticketFk: params.ticketFk},
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/ticket-config.json b/modules/ticket/back/models/ticket-config.json
index d757fbd1a..6dd2808ea 100644
--- a/modules/ticket/back/models/ticket-config.json
+++ b/modules/ticket/back/models/ticket-config.json
@@ -23,6 +23,16 @@
},
"daysForWarningClaim": {
"type": "number"
+ },
+ "defaultAttenderFk": {
+ "type": "number"
+ }
+ },
+ "relations": {
+ "attender": {
+ "type": "belongsTo",
+ "model": "Worker",
+ "foreignKey": "defaultAttenderFk"
}
}
}
diff --git a/modules/ticket/back/models/ticket-log.json b/modules/ticket/back/models/ticket-log.json
index 32b4afd13..d75589f11 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"
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-observation.js b/modules/ticket/back/models/ticket-observation.js
index 77d15d85c..3076484bf 100644
--- a/modules/ticket/back/models/ticket-observation.js
+++ b/modules/ticket/back/models/ticket-observation.js
@@ -1,6 +1,7 @@
const UserError = require('vn-loopback/util/user-error');
module.exports = Self => {
+ require('../methods/ticket-observation/addDropOff')(Self);
Self.rewriteDbError(function(err) {
if (err.code === 'ER_DUP_ENTRY')
return new UserError(`The observation type can't be repeated`);
diff --git a/modules/ticket/back/models/ticket-request.js b/modules/ticket/back/models/ticket-request.js
index d133f85d5..622cd7696 100644
--- a/modules/ticket/back/models/ticket-request.js
+++ b/modules/ticket/back/models/ticket-request.js
@@ -8,21 +8,21 @@ module.exports = function(Self) {
require('../methods/ticket-request/getItemTypeWorker')(Self);
Self.observe('before save', async function(ctx) {
- if (ctx.isNewInstance) {
- const loopBackContext = LoopBackContext.getCurrentContext();
- const filter = {where: {id: loopBackContext.active.accessToken.userId}};
- const models = Self.app.models;
- const worker = await models.Worker.findOne(filter);
+ const loopBackContext = LoopBackContext.getCurrentContext();
+ const filter = {where: {id: loopBackContext.active.accessToken.userId}};
+ const models = Self.app.models;
+ const worker = await models.Worker.findOne(filter);
+ const instance = ctx.instance;
+ const attenderFk = instance?.attenderFk;
- const instance = ctx.instance;
+ if (ctx.isNewInstance) {
instance.requesterFk = worker.id;
const httpCtx = {req: loopBackContext.active};
const httpRequest = httpCtx.req.http .req;
const $t = httpRequest.__;
- const attenderId = instance.attenderFk;
- if (attenderId) {
+ if (attenderFk) {
const ticket = await models.Ticket.findById(instance.ticketFk);
let messageText = 'New ticket request has been created';
if (instance.price)
@@ -35,8 +35,20 @@ module.exports = function(Self) {
quantity: instance.quantity,
price: instance.price
});
- await models.Chat.sendCheckingPresence(httpCtx, attenderId, message);
+ await models.Chat.sendCheckingPresence(httpCtx, attenderFk, message);
+ } else {
+ const {defaultAttenderFk} = await models.TicketConfig.findOne();
+ Object.assign(instance, {attenderFk: defaultAttenderFk});
}
}
});
+
+ Self.observe('after save', async function(ctx) {
+ const models = Self.app.models;
+ const instance = ctx.instance;
+ if (instance?.attenderFk === null && !ctx.isNewInstance) {
+ const {defaultAttenderFk} = await models.TicketConfig.findOne();
+ await models.TicketRequest.updateAll({id: instance.id}, {attenderFk: defaultAttenderFk});
+ }
+ });
};
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/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/main/index.js b/modules/ticket/front/main/index.js
index c49418cfc..64bb7e191 100644
--- a/modules/ticket/front/main/index.js
+++ b/modules/ticket/front/main/index.js
@@ -1,6 +1,6 @@
import ngModule from '../module';
import ModuleMain from 'salix/components/module-main';
-const UserError = require('vn-loopback/util/user-error');
+import UserError from 'core/lib/user-error';
export default class Ticket extends ModuleMain {
fetchParams($params) {
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/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/extraCommunityPdf.js b/modules/travel/back/methods/travel/extraCommunityPdf.js
index 0c7f0a682..459e74d69 100644
--- a/modules/travel/back/methods/travel/extraCommunityPdf.js
+++ b/modules/travel/back/methods/travel/extraCommunityPdf.js
@@ -79,7 +79,7 @@ module.exports = Self => {
path: '/extra-community-pdf',
verb: 'GET'
},
- //accessScopes: ['read:multimedia']
+ accessScopes: ['DEFAULT', 'read:multimedia']
});
Self.extraCommunityPdf = ctx => Self.printReport(ctx, null, 'extra-community');
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/worker/back/methods/operator/spec/operator.spec.js b/modules/worker/back/methods/operator/spec/operator.spec.js
index 8a7d05298..c80a6542d 100644
--- a/modules/worker/back/methods/operator/spec/operator.spec.js
+++ b/modules/worker/back/methods/operator/spec/operator.spec.js
@@ -52,18 +52,16 @@ describe('Operator', () => {
});
it('should not sent notification when is already notified by another worker', async() => {
- try {
- await models.NotificationQueue.create({
- authorFk: 2,
- notificationFk: notificationName,
- params: JSON.stringify({'labelerId': labeler, 'sectorId': sectorId, 'workerId': 2}),
- created: '2001-01-01 12:30:00',
- status: sentStatus
- });
- await models.Operator.updateAll({id: 1}, {labelerFk: labeler, sectorFk: sectorId});
- } catch (e) {
- expect(e.message).toEqual('Previous notification sended with the same parameters');
- }
+ const {id} = await models.NotificationQueue.create({
+ authorFk: 2,
+ notificationFk: notificationName,
+ params: JSON.stringify({'labelerId': labeler, 'sectorId': sectorId, 'workerId': 2}),
+ created: '2001-01-01 11:30:00',
+ status: sentStatus
+ });
+ const notificationQueue = await updateOperatorAndFindNotification();
+
+ expect(notificationQueue.id).toEqual(id);
});
it('should send a notification when the previous one has distinct params', async() => {
diff --git a/modules/worker/back/methods/worker-dms/downloadFile.js b/modules/worker/back/methods/worker-dms/downloadFile.js
index 871bbffde..93d685429 100644
--- a/modules/worker/back/methods/worker-dms/downloadFile.js
+++ b/modules/worker/back/methods/worker-dms/downloadFile.js
@@ -30,7 +30,7 @@ module.exports = Self => {
path: `/:id/downloadFile`,
verb: 'GET'
},
- //accessScopes: ['read:multimedia']
+ accessScopes: ['DEFAULT', 'read:multimedia']
});
Self.downloadFile = async function(ctx, id) {
diff --git a/modules/worker/back/methods/worker-time-control/resendWeeklyHourEmail.js b/modules/worker/back/methods/worker-time-control/resendWeeklyHourEmail.js
index 896458455..885637118 100644
--- a/modules/worker/back/methods/worker-time-control/resendWeeklyHourEmail.js
+++ b/modules/worker/back/methods/worker-time-control/resendWeeklyHourEmail.js
@@ -1,3 +1,5 @@
+const moment = require('moment');
+
module.exports = Self => {
Self.remoteMethodCtx('resendWeeklyHourEmail', {
description: 'Send the records for the week of the date provided',
@@ -31,7 +33,8 @@ module.exports = Self => {
Object.assign(myOptions, options);
const yearNumber = dated.getFullYear();
- const weekNumber = getWeekNumber(dated);
+ const weekNumber = moment(dated).isoWeek();
+
const workerTimeControlMail = await models.WorkerTimeControlMail.findOne({
where: {
workerFk: workerId,
@@ -54,15 +57,4 @@ module.exports = Self => {
return false;
};
-
- function getWeekNumber(date) {
- const tempDate = new Date(date);
- let dayOfWeek = tempDate.getDay();
- dayOfWeek = (dayOfWeek === 0) ? 7 : dayOfWeek;
- const firstDayOfWeek = new Date(tempDate.getFullYear(), tempDate.getMonth(), tempDate.getDate() - (dayOfWeek - 1));
- const firstDayOfYear = new Date(tempDate.getFullYear(), 0, 1);
- const differenceInMilliseconds = firstDayOfWeek.getTime() - firstDayOfYear.getTime();
- const weekNumber = Math.floor(differenceInMilliseconds / (1000 * 60 * 60 * 24 * 7)) + 1;
- return weekNumber;
- }
};
diff --git a/modules/worker/back/methods/worker-time-control/specs/clockIn.spec.js b/modules/worker/back/methods/worker-time-control/specs/clockIn.spec.js
index 343eb2a71..daf7284ac 100644
--- a/modules/worker/back/methods/worker-time-control/specs/clockIn.spec.js
+++ b/modules/worker/back/methods/worker-time-control/specs/clockIn.spec.js
@@ -45,7 +45,7 @@ describe('workerTimeControl clockIn()', () => {
throw e;
}
});
-
+
it('should throw an error trying to change a middle hour to out not resting 12h', async() => {
activeCtx.accessToken.userId = HHRRId;
const workerId = teamBossId;
@@ -99,6 +99,32 @@ describe('workerTimeControl clockIn()', () => {
}
});
+ it('should throw an error trying to add an "in" entry if the last clockIn is not out', async() => {
+ activeCtx.accessToken.userId = HHRRId;
+ const workerId = teamBossId;
+ const tx = await models.WorkerTimeControl.beginTransaction({});
+ try {
+ const options = {transaction: tx};
+
+ ctx.args = {timed: "2000-12-25T21:00:00.000Z", direction: 'in'};
+ await models.WorkerTimeControl.addTimeEntry(ctx, workerId, options);
+
+ ctx.args = {timed: "2000-12-25T22:00:00.000Z", direction: 'middle'};
+ await models.WorkerTimeControl.addTimeEntry(ctx, workerId, options);
+
+ ctx.args = {timed: "2000-12-25T22:30:00.000Z", direction: 'middle'};
+ await models.WorkerTimeControl.addTimeEntry(ctx, workerId, options);
+
+ ctx.args = {timed: "2000-12-26T01:00:00.000Z", direction: 'in'};
+ await models.WorkerTimeControl.addTimeEntry(ctx, workerId, options);
+
+ await tx.rollback();
+ } catch (e) {
+ expect(e.message).toBe('Dirección incorrecta');
+ await tx.rollback();
+ }
+ });
+
describe('as Role errors', () => {
it('should add if the current user is team boss and the target user is himself', async() => {
activeCtx.accessToken.userId = teamBossId;
diff --git a/modules/worker/back/methods/worker/createAbsence.js b/modules/worker/back/methods/worker/createAbsence.js
index d628d0a2b..2de1d6e4d 100644
--- a/modules/worker/back/methods/worker/createAbsence.js
+++ b/modules/worker/back/methods/worker/createAbsence.js
@@ -98,6 +98,22 @@ module.exports = Self => {
if (isHalfHoliday && hasHalfHoliday)
throw new UserError(`Cannot add more than one '1/2 day vacation'`);
+ const isFestive = absenceType.isFestiveEligible;
+
+ const workCenter = await models.Business.findOne({
+ where: {id: args.businessFk}
+ },);
+
+ const [holiday] = await models.CalendarHoliday.find({
+ where: {
+ dated: args.dated,
+ workCenterFk: workCenter.workCenterFk
+ }
+ });
+
+ if (holiday && isFestive)
+ throw new UserError(`Cannot add holidays on this day`);
+
const absence = await models.Calendar.create({
businessFk: labour.businessFk,
dayOffTypeFk: args.absenceTypeId,
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 346e43c51..aadaca99b 100644
--- a/modules/worker/back/methods/worker/specs/createAbsence.spec.js
+++ b/modules/worker/back/methods/worker/specs/createAbsence.spec.js
@@ -104,6 +104,35 @@ describe('Worker createAbsence()', () => {
expect(error.message).toEqual(`Cannot add more than one '1/2 day vacation'`);
});
+ it(`should throw an error when adding a "Holiday" absence if there's a festivity`, async() => {
+ const ctx = {
+ req: {accessToken: {userId: 9}},
+ args: {
+ id: 3,
+ businessFk: 3,
+ absenceTypeId: 1,
+ dated: '2001-12-08T23:00:00.000Z'
+ }
+ };
+ const workerId = 1;
+
+ const tx = await app.models.Calendar.beginTransaction({});
+
+ let error;
+ try {
+ const options = {transaction: tx};
+
+ await app.models.Worker.createAbsence(ctx, workerId, options);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ error = e;
+ }
+
+ 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() => {
const ctx = {
req: {accessToken: {userId: 19}},
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/new.spec.js b/modules/worker/back/methods/worker/specs/new.spec.js
index 66959e0a7..5a5649154 100644
--- a/modules/worker/back/methods/worker/specs/new.spec.js
+++ b/modules/worker/back/methods/worker/specs/new.spec.js
@@ -1,189 +1,114 @@
-const models = require('vn-loopback/server/server').models;
+const {models} = require('vn-loopback/server/server');
const LoopBackContext = require('loopback-context');
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}};
-
- 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');
+ beforeAll(async() => {
+ const activeCtx = {accessToken, http: {req: {headers: {origin: 'http://localhost'}}}};
+ spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({active: activeCtx});
});
- 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 +119,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/model-config.json b/modules/worker/back/model-config.json
index e1a47b7e9..b7c355511 100644
--- a/modules/worker/back/model-config.json
+++ b/modules/worker/back/model-config.json
@@ -121,6 +121,9 @@
},
"Operator": {
"dataSource": "vn"
+ },
+ "Locker": {
+ "dataSource": "vn"
}
}
diff --git a/modules/worker/back/models/absence-type.json b/modules/worker/back/models/absence-type.json
index 7fc62f780..2f6103367 100644
--- a/modules/worker/back/models/absence-type.json
+++ b/modules/worker/back/models/absence-type.json
@@ -22,7 +22,10 @@
},
"holidayEntitlementRate": {
"type": "number"
- }
+ },
+ "isFestiveEligible": {
+ "type": "boolean"
+ }
},
"acls": [
{
@@ -32,4 +35,4 @@
"permission": "ALLOW"
}
]
-}
\ No newline at end of file
+}
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/locker.js b/modules/worker/back/models/locker.js
new file mode 100644
index 000000000..4475c2cd1
--- /dev/null
+++ b/modules/worker/back/models/locker.js
@@ -0,0 +1,21 @@
+module.exports = Self => {
+ Self.observe('before save', async ctx => {
+ const models = Self.app.models;
+ const changes = ctx.data || ctx.instance;
+ const instance = ctx.currentInstance;
+
+ const workerFk = changes?.workerFk || instance?.workerFk;
+ if (workerFk) {
+ const locker = await models.Locker.findOne({
+ where: {workerFk}
+ }, ctx.options);
+
+ if (locker) {
+ await Self.rawSql(
+ 'UPDATE locker SET workerFk = NULL where workerFk = ?',
+ [workerFk],
+ ctx.options);
+ }
+ }
+ });
+};
diff --git a/modules/worker/back/models/locker.json b/modules/worker/back/models/locker.json
new file mode 100644
index 000000000..335fca5a9
--- /dev/null
+++ b/modules/worker/back/models/locker.json
@@ -0,0 +1,23 @@
+{
+ "name": "Locker",
+ "base": "VnModel",
+ "description": "Worker's locker",
+ "options": {
+ "mysql": {
+ "table": "locker"
+ }
+ },
+ "properties": {
+ "code": {
+ "type": "string"
+ },
+ "gender": {
+ "type": "string"
+ }
+ },
+ "scopes": {
+ "codes": {
+ "fields": ["id","code"]
+ }
+ }
+}
diff --git a/modules/worker/back/models/operator.js b/modules/worker/back/models/operator.js
index 1ebc1643c..70e20af5b 100644
--- a/modules/worker/back/models/operator.js
+++ b/modules/worker/back/models/operator.js
@@ -18,9 +18,9 @@ module.exports = Self => {
const {backupPrinterNotificationDelay} = await models.ProductionConfig.findOne();
if (backupPrinterNotificationDelay) {
const notifications = await models.NotificationQueue.find(
- {where: {created: {gte: Date.vnNow() - (backupPrinterNotificationDelay * 1000) + (3600 * 1000)},
+ {where: {created: {gte: new Date(Date.vnNow() - (backupPrinterNotificationDelay * 1000))},
notificationFk: notificationName,
- status: 'sent'
+ status: {neq: 'error'}
}
});
@@ -30,8 +30,7 @@ module.exports = Self => {
return Object.keys(criteria).every(key => criteria[key] === paramsObj?.[key]);
});
- if (filteredNotifications.length >= 1)
- throw new Error('Previous notification sended with the same parameters');
+ if (filteredNotifications.length >= 1) return;
}
await models.NotificationQueue.create({
diff --git a/modules/worker/back/models/specs/locker.spec.js b/modules/worker/back/models/specs/locker.spec.js
new file mode 100644
index 000000000..96fca2405
--- /dev/null
+++ b/modules/worker/back/models/specs/locker.spec.js
@@ -0,0 +1,59 @@
+const {models} = require('vn-loopback/server/server');
+
+describe('locker model ', () => {
+ const productionBossId = 50;
+ const hrBuyerId = 124;
+ const hrId = 37;
+ const jessicaJonesId = 1110;
+ const bruceBannerId = 1109;
+ const lockerMaleId = 3;
+ const lockerFemaleId = 5;
+ const lockerNewFemaleId = 6;
+ let ctx;
+ let options;
+ let tx;
+
+ beforeEach(async() => {
+ ctx = {
+ req: {
+ accessToken: {userId: hrId},
+ headers: {origin: 'http://localhost'}
+ },
+ };
+ options = {transaction: tx};
+ tx = await models.Locker.beginTransaction({});
+ options.transaction = tx;
+ });
+
+ afterEach(async() => {
+ await tx.rollback();
+ });
+
+ it('should allocate a locker', async() => {
+ ctx.req.accessToken.userId = productionBossId;
+
+ const locker = await models.Locker.findById(lockerMaleId, null, options);
+ await locker.updateAttributes({workerFk: bruceBannerId}, options);
+
+ expect(locker.workerFk).toEqual(bruceBannerId);
+ });
+
+ it('should take away a locker', async() => {
+ ctx.req.accessToken.userId = hrBuyerId;
+ const locker = await models.Locker.findById(lockerFemaleId, null, options);
+ await locker.updateAttributes({workerFk: null}, options);
+
+ expect(locker.workerFk).toEqual(null);
+ });
+
+ it('should change a locker', async() => {
+ 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(oldNowLocker.workerFk).toEqual(null);
+ });
+});
diff --git a/modules/worker/back/models/worker.js b/modules/worker/back/models/worker.js
index b475bf26e..0b0e043f2 100644
--- a/modules/worker/back/models/worker.js
+++ b/modules/worker/back/models/worker.js
@@ -20,10 +20,7 @@ module.exports = Self => {
require('../methods/worker/search')(Self);
require('../methods/worker/isAuthorized')(Self);
require('../methods/worker/setPassword')(Self);
-
- Self.validatesUniquenessOf('locker', {
- message: 'This locker has already been assigned'
- });
+ 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 57dc80ec9..4796c6373 100644
--- a/modules/worker/back/models/worker.json
+++ b/modules/worker/back/models/worker.json
@@ -25,40 +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"
- },
- "locker": {
- "type" : "number"
+ "type": "string",
+ "required": true
},
"fi": {
- "type" : "string"
+ "type": "string"
},
"birth": {
- "type" : "date"
+ "type": "date"
},
"isF11Allowed": {
- "type" : "boolean"
+ "type": "boolean"
+ },
+ "sex": {
+ "type": "string"
+ },
+ "isFreelance": {
+ "type": "boolean"
+ },
+ "fiDueDate": {
+ "type": "date"
+ },
+ "hasMachineryAuthorized": {
+ "type": "boolean"
+ },
+ "seniority": {
+ "type": "date"
+ },
+ "isDisable": {
+ "type": "boolean"
+ },
+ "isSsDiscounted": {
+ "type": "boolean"
}
},
"relations": {
@@ -91,88 +110,20 @@
"type": "hasMany",
"model": "WorkerTeamCollegues",
"foreignKey": "workerFk"
+ },
+ "locker": {
+ "type": "hasMany",
+ "model": "Locker",
+ "foreignKey": "workerFk"
}
},
- "scopes":{
- "summary": {
- "include": [
- {
- "relation": "user",
- "scope": {
- "fields": ["email", "name", "nickname", "roleFk"],
- "include": [
- {
- "relation": "role",
- "scope": {
- "fields": ["name"]
- }
- },
- {
- "relation": "emailUser",
- "scope": {
- "fields": ["email"]
- }
- }
- ]
- }
- }, {
- "relation": "department",
- "scope": {
- "include": {
- "relation": "department"
- }
- }
- }, {
- "relation": "boss"
- }, {
- "relation": "client",
- "scope": {
- "fields": [
- "id",
- "name",
- "fi",
- "socialName",
- "contact",
- "street",
- "city",
- "postcode",
- "email",
- "mobile",
- "isActive",
- "credit",
- "creditInsurance",
- "iban",
- "dueDay",
- "isEqualizated",
- "isFreezed",
- "hasToInvoiceByAddress",
- "hasToInvoice",
- "isToBeMailed",
- "hasSepaVnl",
- "hasLcr",
- "hasCoreVnl",
- "hasCoreVnh",
- "hasIncoterms",
- "isTaxDataChecked",
- "eypbc",
- "quality",
- "isVies",
- "isRelevant",
- "accountingAccount",
- "created",
- "sageTaxTypeFk",
- "sageTransactionTypeFk",
- "businessTypeFk",
- "salesPersonFk",
- "hasElectronicInvoice",
- "rating",
- "recommendedCredit"
- ]
- }
- }, {
- "relation": "sip"
- }
- ]
+ "acls": [
+ {
+ "property": "__get__locker",
+ "accessType": "READ",
+ "permission": "ALLOW",
+ "principalType": "ROLE",
+ "principalId": "$owner"
}
- }
-}
+ ]
+}
\ No newline at end of file
diff --git a/modules/worker/front/basic-data/index.html b/modules/worker/front/basic-data/index.html
index 2d85d018d..bece1b6fd 100644
--- a/modules/worker/front/basic-data/index.html
+++ b/modules/worker/front/basic-data/index.html
@@ -54,8 +54,8 @@
@@ -75,11 +75,6 @@
ng-model="$ctrl.worker.SSN"
rule>
-
-
diff --git a/modules/worker/front/card/index.js b/modules/worker/front/card/index.js
index 1aa548db9..9a40e31c2 100644
--- a/modules/worker/front/card/index.js
+++ b/modules/worker/front/card/index.js
@@ -4,13 +4,37 @@ import ModuleCard from 'salix/components/module-card';
class Controller extends ModuleCard {
reload() {
const filter = {
- where: {
- id: this.$params.id}
+ include: [
+ {
+ relation: 'user',
+ scope: {
+ fields: ['name', 'emailVerified'],
+ include: {
+ relation: 'emailUser',
+ scope: {
+ fields: ['email']
+ }
+ }
+ }
+ }, {
+ relation: 'sip',
+ scope: {
+ fields: ['extension', 'secret']
+ }
+ }, {
+ relation: 'department',
+ scope: {
+ include: {
+ relation: 'department'
+ }
+ }
+ }
+ ]
};
return Promise.all([
- this.$http.get(`Workers/summary`, {filter})
- .then(res => this.worker = res.data[0]),
+ this.$http.get(`Workers/${this.$params.id}`, {filter})
+ .then(res => this.worker = res.data),
this.$http.get(`Workers/${this.$params.id}/activeContract`)
.then(res => this.hasWorkCenter = res.data?.workCenterFk)
]);
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}})
this.entity = res.data[0]);
+ return this.getData(`Workers/${this.id}`, {filter})
+ .then(res => this.entity = res.data);
}
getPassRequirements() {
diff --git a/modules/worker/front/descriptor/index.spec.js b/modules/worker/front/descriptor/index.spec.js
index cee8b0def..4f7fa6a05 100644
--- a/modules/worker/front/descriptor/index.spec.js
+++ b/modules/worker/front/descriptor/index.spec.js
@@ -14,14 +14,14 @@ describe('vnWorkerDescriptor', () => {
describe('loadData()', () => {
it(`should perform a get query to store the worker data into the controller`, () => {
const id = 1;
- const response = ['foo'];
+ const response = 'foo';
$httpBackend.whenGET('UserConfigs/getUserConfig').respond({});
- $httpBackend.expectRoute('GET', `Workers/summary`).respond(response);
+ $httpBackend.expectRoute('GET', `Workers/${id}`).respond(response);
controller.id = id;
$httpBackend.flush();
- expect([controller.worker]).toEqual(response);
+ expect(controller.worker).toEqual(response);
});
});
diff --git a/modules/worker/front/dms/index/index.html b/modules/worker/front/dms/index/index.html
index e4cec8002..310fb95d1 100644
--- a/modules/worker/front/dms/index/index.html
+++ b/modules/worker/front/dms/index/index.html
@@ -54,7 +54,7 @@
+ ng-click="$ctrl.downloadFile(document.dmsFk, document.isDocuware)">
{{::document.dms.file}}
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 @@
-
-
-
-
-
-
-
- {{::$ctrl.shelving.worker.user.nickname}}
-
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/shelving/front/search-panel/index.js b/modules/shelving/front/search-panel/index.js
deleted file mode 100644
index 51b81538b..000000000
--- a/modules/shelving/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('vnShelvingSearchPanel', {
- template: require('./index.html'),
- controller: SearchPanel
-});
diff --git a/modules/shelving/front/search-panel/locale/es.yml b/modules/shelving/front/search-panel/locale/es.yml
deleted file mode 100644
index bd19b1b33..000000000
--- a/modules/shelving/front/search-panel/locale/es.yml
+++ /dev/null
@@ -1 +0,0 @@
-Search shelvings by code: Busca carros por código
\ No newline at end of file
diff --git a/modules/shelving/front/summary/index.html b/modules/shelving/front/summary/index.html
deleted file mode 100644
index 61e44d278..000000000
--- a/modules/shelving/front/summary/index.html
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
- - - Basic data - -
-
-
-
-
-
-
-
-
-
-
-
-
-
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 2ac8b8e5e..56239ca3c 100755
--- a/myt.config.yml
+++ b/myt.config.yml
@@ -15,7 +15,6 @@ schemas:
- hedera
- pbx
- psico
- - rfid
- sage
- salix
- srt
@@ -228,7 +227,7 @@ localFixtures:
- expeditionScan
- expeditionState
- expeditionStateType
- - expeditionTruck
+ - roadmapStop
- expense
- genus
- greuge
@@ -289,6 +288,7 @@ localFixtures:
- payDemDetail
- payMethod
- payrollCategories
+ - payrollWorker
- postCode
- priceFixed
- printer
@@ -323,6 +323,7 @@ localFixtures:
- shelving
- smsConfig
- specie
+ - split
- supplier
- supplierAccount
- supplierActivity
@@ -393,8 +394,4 @@ localFixtures:
- zoneExclusionGeo
- zoneGeo
- zoneIncluded
- - zoneWarehouse
- vn2008:
- - payroll_employee
- - Splits
- - zones
+ - zoneWarehouse
\ No newline at end of file
diff --git a/package.json b/package.json
index aa2aa2238..8b8281e0d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "salix-back",
- "version": "24.18.0",
+ "version": "24.26.0",
"author": "Verdnatura Levante SL",
"description": "Salix backend",
"license": "GPL-3.0",
@@ -39,6 +39,7 @@
"loopback-context": "^3.5.2",
"loopback-datasource-juggler": "3.36.1",
"md5": "^2.2.1",
+ "moment": "^2.30.1",
"mysql": "2.18.1",
"node-ssh": "^11.0.0",
"object.pick": "^1.3.0",
@@ -81,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",
@@ -113,7 +116,8 @@
"test:e2e": "node e2e/tests.js",
"test:front": "jest --watch",
"back": "nodemon --inspect -w modules ./node_modules/gulp/bin/gulp.js back",
- "lint": "eslint ./ --cache --ignore-pattern .gitignore"
+ "lint": "eslint ./ --cache --ignore-pattern .gitignore",
+ "watch:db": "node ./db/dbWatcher.js"
},
"jest": {
"projects": [
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d3959ac03..22d5b46f1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -83,6 +83,9 @@ dependencies:
md5:
specifier: ^2.2.1
version: 2.3.0
+ moment:
+ specifier: ^2.30.1
+ version: 2.30.1
mysql:
specifier: 2.18.1
version: 2.18.1
@@ -199,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)
@@ -2629,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:
@@ -2787,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
@@ -3767,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
@@ -7087,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'}
@@ -8321,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'}
@@ -10202,6 +10251,10 @@ packages:
to-iso-string: 0.0.2
dev: false
+ /moment@2.30.1:
+ resolution: {integrity: sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==}
+ dev: false
+
/ms@0.7.1:
resolution: {integrity: sha512-lRLiIR9fSNpnP6TC4v8+4OU7oStC01esuNowdQ34L+Gk8e5Puoc88IqJ+XAY/B3Mn2ZKis8l8HX90oU8ivzUHg==}
dev: false
@@ -12058,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'}
@@ -13556,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/templates/reports/campaign-metrics/sql/client.sql b/print/templates/reports/campaign-metrics/sql/client.sql
index 9f392c97e..38f9fffc6 100644
--- a/print/templates/reports/campaign-metrics/sql/client.sql
+++ b/print/templates/reports/campaign-metrics/sql/client.sql
@@ -6,7 +6,7 @@ SELECT
c.id,
c.name AS clientName,
p.name AS province,
- co.country
+ co.name country
FROM client c
JOIN province p ON c.provinceFk = p.id
JOIN country co ON c.countryFk = co.id
diff --git a/print/templates/reports/claim-pickup-order/sql/client.sql b/print/templates/reports/claim-pickup-order/sql/client.sql
index 640b0c8a7..47e89cf1b 100644
--- a/print/templates/reports/claim-pickup-order/sql/client.sql
+++ b/print/templates/reports/claim-pickup-order/sql/client.sql
@@ -8,7 +8,7 @@ SELECT
a.street,
a.nickname,
p.name AS province,
- ct.country,
+ ct.name country,
IFNULL(c.phone, cc.phone) AS phone
FROM claim cl
JOIN client c ON c.id = cl.clientFk
diff --git a/print/templates/reports/client-debt-statement/sql/client.sql b/print/templates/reports/client-debt-statement/sql/client.sql
index d675cf168..acc616131 100644
--- a/print/templates/reports/client-debt-statement/sql/client.sql
+++ b/print/templates/reports/client-debt-statement/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/cmr/sql/data.sql b/print/templates/reports/cmr/sql/data.sql
index e9500cc4b..42231709a 100644
--- a/print/templates/reports/cmr/sql/data.sql
+++ b/print/templates/reports/cmr/sql/data.sql
@@ -14,12 +14,12 @@ SELECT c.id cmrFk,
s.street carrierStreet,
s.postCode carrierPostCode,
s.city carrierCity,
- cou.country carrierCountry,
+ cou.name carrierCountry,
s2.name senderName,
s2.street senderStreet,
s2.postCode senderPostCode,
s2.city senderCity,
- cou2.country senderCountry,
+ cou2.name senderCountry,
a.street deliveryStreet,
a.id deliveryAddressFk,
a.postalCode deliveryPostalCode,
@@ -27,12 +27,12 @@ SELECT c.id cmrFk,
a.nickname deliveryName,
a.phone deliveryPhone,
a.mobile deliveryMobile,
- cou3.country deliveryCountry,
+ cou3.name deliveryCountry,
cl.phone clientPhone,
a2.street loadStreet,
a2.postalCode loadPostalCode,
a2.city loadCity,
- cou4.country loadCountry,
+ cou4.name loadCountry,
co.stamp senderStamp,
s.stamp deliveryStamp
FROM cmr c
diff --git a/print/templates/reports/collection-label/assets/css/style.css b/print/templates/reports/collection-label/assets/css/style.css
index eb300f850..3eb68a2b2 100644
--- a/print/templates/reports/collection-label/assets/css/style.css
+++ b/print/templates/reports/collection-label/assets/css/style.css
@@ -32,9 +32,12 @@ html {
#bold {
font-weight: bold;
}
-#barcode{
+.barcode{
width: 370px;
}
+.qr{
+ max-height: 137px;
+}
#shipped {
font-weight: bold;
width: 50px;
diff --git a/print/templates/reports/collection-label/collection-label.html b/print/templates/reports/collection-label/collection-label.html
index a0bfcad0e..752a31185 100644
--- a/print/templates/reports/collection-label/collection-label.html
+++ b/print/templates/reports/collection-label/collection-label.html
@@ -8,11 +8,15 @@
{{getAgencyDescripton(labelData)}}
{{dashIfEmpty(getAgencyDescription(labelData))}}
- {{$t('entry')}} {{entry.id}} + + {{$t('entry')}} + {{entry.id}} + {{$t('dated')}} {{formatDate(entry.shipped, '%d-%m-%Y')}} {{$t('reference')}} {{entry.reference}}
@@ -67,6 +70,13 @@| {{$t('total')}} | +{{total.price | currency('EUR', $i18n.locale)}} | ++ |