\ No newline at end of file
+
diff --git a/modules/supplier/front/consumption-search-panel/index.html b/modules/supplier/front/consumption-search-panel/index.html
index 597c6edab..5cba11d3c 100644
--- a/modules/supplier/front/consumption-search-panel/index.html
+++ b/modules/supplier/front/consumption-search-panel/index.html
@@ -17,12 +17,11 @@
- {{nickname}}
diff --git a/modules/ticket/back/methods/expedition-state/addExpeditionState.js b/modules/ticket/back/methods/expedition-state/addExpeditionState.js
new file mode 100644
index 000000000..f1199f188
--- /dev/null
+++ b/modules/ticket/back/methods/expedition-state/addExpeditionState.js
@@ -0,0 +1,66 @@
+const UserError = require('vn-loopback/util/user-error');
+
+module.exports = Self => {
+ Self.remoteMethod('addExpeditionState', {
+ description: 'Update an expedition state',
+ accessType: 'WRITE',
+ accepts: [
+ {
+ arg: 'expeditions',
+ type: ['object'],
+ required: true,
+ description: 'Array of objects containing expeditionFk and stateCode'
+ }
+ ],
+ returns: {
+ type: 'boolean',
+ root: true
+ },
+ http: {
+ path: `/addExpeditionState`,
+ verb: 'post'
+ }
+ });
+
+ Self.addExpeditionState = async(expeditions, options) => {
+ const models = Self.app.models;
+ let tx;
+ const myOptions = {};
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
+
+ if (!myOptions.transaction) {
+ tx = await Self.beginTransaction({});
+ myOptions.transaction = tx;
+ }
+ let expeditionId;
+ try {
+ for (const expedition of expeditions) {
+ const expeditionStateType = await models.ExpeditionStateType.findOne(
+ {
+ fields: ['id'],
+ where: {code: expedition.stateCode}
+ }, myOptions
+ );
+ if (!expeditionStateType)
+ throw new UserError(`Invalid state code: ${expedition.stateCode}.`);
+
+ const typeFk = expeditionStateType.id;
+ expeditionId = expedition.expeditionFk;
+
+ await models.ExpeditionState.create({
+ expeditionFk: expedition.expeditionFk,
+ typeFk,
+ }, myOptions);
+ }
+
+ if (tx) await tx.commit();
+ } catch (e) {
+ if (tx) await tx.rollback();
+ if (e instanceof UserError)
+ throw e;
+
+ throw new UserError(`Invalid expedition id: ${expeditionId}.`);
+ }
+ };
+};
diff --git a/modules/ticket/back/methods/expedition-state/specs/addExpeditionState.spec.js b/modules/ticket/back/methods/expedition-state/specs/addExpeditionState.spec.js
new file mode 100644
index 000000000..819a43a60
--- /dev/null
+++ b/modules/ticket/back/methods/expedition-state/specs/addExpeditionState.spec.js
@@ -0,0 +1,75 @@
+const models = require('vn-loopback/server/server').models;
+
+describe('expeditionState addExpeditionState()', () => {
+ it('should update the expedition states', async() => {
+ const tx = await models.ExpeditionState.beginTransaction({});
+
+ try {
+ const options = {transaction: tx};
+ const payload = [
+ {
+ expeditionFk: 8,
+ stateCode: 'ON DELIVERY'
+ },
+ ];
+
+ await models.ExpeditionState.addExpeditionState(payload, options);
+
+ const expeditionState = await models.ExpeditionState.findOne({
+ where: {id: 5}
+ });
+
+ expect(expeditionState.typeFk).toEqual(1);
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+
+ it('should throw an error an error when an stateCode does not exist', async() => {
+ const tx = await models.ExpeditionState.beginTransaction({});
+ let error;
+
+ try {
+ const options = {transaction: tx};
+ const payload = [
+ {
+ expeditionFk: 2,
+ stateCode: 'DUMMY'
+ }
+ ];
+ await models.ExpeditionState.addExpeditionState(payload, options);
+
+ await tx.rollback();
+ } catch (e) {
+ error = e;
+ await tx.rollback();
+ }
+
+ expect(error.message).toContain('Invalid state code: DUMMY.');
+ });
+
+ it('should throw an error when expeditionFk does not exist', async() => {
+ const tx = await models.ExpeditionState.beginTransaction({});
+ let error;
+ try {
+ const options = {transaction: tx};
+ const payload = [
+ {
+ expeditionFk: 50,
+ stateCode: 'LOST'
+ }
+ ];
+
+ await models.ExpeditionState.addExpeditionState(payload, options);
+
+ await tx.rollback();
+ } catch (e) {
+ error = e;
+ await tx.rollback();
+ }
+
+ expect(error.message).toContain('Invalid expedition id: 50.');
+ });
+});
diff --git a/modules/ticket/back/methods/packaging/specs/listPackaging.spec.js b/modules/ticket/back/methods/packaging/specs/listPackaging.spec.js
index 1b5892e04..d73ba7386 100644
--- a/modules/ticket/back/methods/packaging/specs/listPackaging.spec.js
+++ b/modules/ticket/back/methods/packaging/specs/listPackaging.spec.js
@@ -10,7 +10,7 @@ describe('ticket listPackaging()', () => {
const filter = {where: {packagingFk: 1}};
const [response] = await models.Packaging.listPackaging(filter, options);
- expect(response.name).toEqual('Container ammo box 1m');
+ expect(response.name).toEqual('Container ammo box 100cm');
await tx.rollback();
} catch (e) {
diff --git a/modules/ticket/back/methods/sale-tracking/delete.js b/modules/ticket/back/methods/sale-tracking/delete.js
new file mode 100644
index 000000000..0b977e5d4
--- /dev/null
+++ b/modules/ticket/back/methods/sale-tracking/delete.js
@@ -0,0 +1,69 @@
+
+module.exports = Self => {
+ Self.remoteMethod('delete', {
+ description: 'Delete sale trackings and item shelving sales',
+ accessType: 'READ',
+ accepts: [
+ {
+ arg: 'saleFk',
+ type: 'number',
+ description: 'The sale id'
+ },
+ {
+ arg: 'stateCode',
+ type: 'string'
+ }
+ ],
+ returns: {
+ type: ['object'],
+ root: true
+ },
+ http: {
+ path: `/delete`,
+ verb: 'POST'
+ }
+ });
+
+ Self.delete = async(saleFk, stateCode, options) => {
+ const models = Self.app.models;
+ const myOptions = {};
+ let tx;
+
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
+
+ if (!myOptions.transaction) {
+ tx = await Self.beginTransaction({});
+ myOptions.transaction = tx;
+ }
+
+ try {
+ if (stateCode === 'PREPARED') {
+ const itemShelvingSales = await models.ItemShelvingSale.find({where: {saleFk: saleFk}}, myOptions);
+ for (let itemShelvingSale of itemShelvingSales)
+ await itemShelvingSale.destroy(myOptions);
+ }
+
+ const state = await models.State.findOne({
+ where: {code: stateCode}
+ }, myOptions);
+
+ const filter = {
+ where: {
+ saleFk: saleFk,
+ stateFk: state.id
+ }
+ };
+ const saleTrackings = await models.SaleTracking.find(filter, myOptions);
+ for (let saleTracking of saleTrackings)
+ await saleTracking.destroy(myOptions);
+
+ if (tx) await tx.commit();
+
+ return true;
+ } catch (e) {
+ if (tx) await tx.rollback();
+ throw e;
+ }
+ };
+};
diff --git a/modules/ticket/back/methods/sale-tracking/filter.js b/modules/ticket/back/methods/sale-tracking/filter.js
new file mode 100644
index 000000000..2fa21cb1a
--- /dev/null
+++ b/modules/ticket/back/methods/sale-tracking/filter.js
@@ -0,0 +1,94 @@
+
+const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
+
+module.exports = Self => {
+ Self.remoteMethod('filter', {
+ description: 'Returns a list with the lines of a ticket and its different states of preparation',
+ accessType: 'READ',
+ accepts: [
+ {
+ arg: 'id',
+ type: 'number',
+ required: true,
+ description: 'The ticket id',
+ http: {source: 'path'}
+ },
+ {
+ arg: 'filter',
+ type: 'object',
+ description: 'Filter defining where and paginated data'
+ }
+ ],
+ returns: {
+ type: ['object'],
+ root: true
+ },
+ http: {
+ path: `/:id/filter`,
+ verb: 'GET'
+ }
+ });
+
+ Self.filter = async(id, filter, options) => {
+ const conn = Self.dataSource.connector;
+ const myOptions = {};
+
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
+
+ const stmts = [];
+ let stmt;
+
+ stmts.push('CALL cache.last_buy_refresh(FALSE)');
+
+ stmt = new ParameterizedSQL(
+ `SELECT t.clientFk,
+ t.shipped,
+ s.ticketFk,
+ s.itemFk,
+ s.quantity,
+ s.concept,
+ s.id saleFk,
+ i.image,
+ i.subName,
+ IF(stPrevious.saleFk,TRUE,FALSE) as isPreviousSelected,
+ stPrevious.isChecked as isPrevious,
+ stPrepared.isChecked as isPrepared,
+ stControled.isChecked as isControled,
+ sgd.id saleGroupDetailFk,
+ (MAX(sgd.id) IS NOT NULL) AS hasSaleGroupDetail,
+ p.code AS parkingCode,
+ i.value5,
+ i.value6,
+ i.value7,
+ i.value8,
+ i.value9,
+ i.value10
+ FROM vn.ticket t
+ JOIN vn.sale s ON s.ticketFk = t.id
+ JOIN vn.item i ON i.id = s.itemFk
+ LEFT JOIN cache.last_buy lb ON lb.item_id = i.id AND lb.warehouse_id = t.warehouseFk
+ LEFT JOIN vn.state st ON TRUE
+ LEFT JOIN vn.saleTracking stPrevious ON stPrevious.saleFk = s.id
+ AND stPrevious.stateFk = (SELECT id FROM vn.state WHERE code = 'PREVIOUS_PREPARATION')
+ LEFT JOIN vn.saleTracking stPrepared ON stPrepared.saleFk = s.id
+ AND stPrepared.stateFk = (SELECT id FROM vn.state WHERE code = 'PREPARED')
+ LEFT JOIN vn.saleTracking stControled ON stControled.saleFk = s.id
+ AND stControled.stateFk = (SELECT id FROM vn.state s2 WHERE code = 'CHECKED')
+ LEFT JOIN vn.saleGroupDetail sgd ON sgd.saleFk = s.id
+ LEFT JOIN vn.saleGroup sg ON sg.id = sgd.saleGroupFk
+ LEFT JOIN vn.parking p ON p.id = sg.parkingFk
+ WHERE t.id = ?
+ GROUP BY s.id`, [id]);
+
+ stmts.push(stmt);
+
+ stmt.merge(Self.makeSuffix(filter));
+
+ const index = stmts.push(stmt) - 1;
+ const sql = ParameterizedSQL.join(stmts, ';');
+ const result = await conn.executeStmt(sql, myOptions);
+
+ return result[index];
+ };
+};
diff --git a/modules/ticket/back/methods/sale-tracking/new.js b/modules/ticket/back/methods/sale-tracking/new.js
new file mode 100644
index 000000000..6a99c299c
--- /dev/null
+++ b/modules/ticket/back/methods/sale-tracking/new.js
@@ -0,0 +1,90 @@
+
+module.exports = Self => {
+ Self.remoteMethodCtx('new', {
+ description: `Replaces the record or creates it if it doesn't exist`,
+ accessType: 'READ',
+ accepts: [
+ {
+ arg: 'saleFk',
+ type: 'number',
+ description: 'The sale id'
+ },
+ {
+ arg: 'isChecked',
+ type: 'boolean'
+ },
+ {
+ arg: 'quantity',
+ type: 'number'
+ },
+ {
+ arg: 'stateCode',
+ type: 'string'
+ }
+ ],
+ returns: {
+ type: ['object'],
+ root: true
+ },
+ http: {
+ path: `/new`,
+ verb: 'POST'
+ }
+ });
+
+ Self.new = async(ctx, saleFk, isChecked, quantity, stateCode, options) => {
+ const models = Self.app.models;
+ const userId = ctx.req.accessToken.userId;
+ const myOptions = {};
+ let tx;
+
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
+
+ if (!myOptions.transaction) {
+ tx = await Self.beginTransaction({});
+ myOptions.transaction = tx;
+ }
+ try {
+ const state = await models.State.findOne({
+ where: {code: stateCode}
+ }, myOptions);
+
+ const saleTracking = await models.SaleTracking.findOne({
+ where: {
+ saleFk: saleFk,
+ stateFk: state.id,
+ workerFk: userId
+ }
+ }, myOptions);
+
+ let newSaleTracking;
+ if (saleTracking) {
+ newSaleTracking = await saleTracking.updateAttributes({
+ saleFk: saleFk,
+ stateFk: state.id,
+ workerFk: userId,
+ isChecked: isChecked,
+ originalQuantity: quantity,
+ isScanned: null
+ }, myOptions);
+ } else {
+ newSaleTracking = await models.SaleTracking.create({
+ saleFk: saleFk,
+ stateFk: state.id,
+ workerFk: userId,
+ isChecked: isChecked,
+ originalQuantity: quantity,
+ isScanned: null
+ }, myOptions);
+ }
+
+ if (tx) await tx.commit();
+
+ return newSaleTracking;
+ } catch (e) {
+ if (tx) await tx.rollback();
+ throw e;
+ }
+ };
+};
diff --git a/modules/ticket/back/methods/sale-tracking/specs/delete.spec.js b/modules/ticket/back/methods/sale-tracking/specs/delete.spec.js
new file mode 100644
index 000000000..a8bcf5692
--- /dev/null
+++ b/modules/ticket/back/methods/sale-tracking/specs/delete.spec.js
@@ -0,0 +1,30 @@
+const models = require('vn-loopback/server/server').models;
+
+describe('sale-tracking delete()', () => {
+ it('should delete a row of saleTracking and itemShelvingSale', async() => {
+ const tx = await models.SaleTracking.beginTransaction({});
+
+ try {
+ const options = {transaction: tx};
+
+ const itemShelvingsBefore = await models.ItemShelvingSale.find(null, options);
+ const saleTrackingsBefore = await models.SaleTracking.find(null, options);
+
+ const saleFk = 1;
+ const stateCode = 'PREPARED';
+ const result = await models.SaleTracking.delete(saleFk, stateCode, options);
+
+ const itemShelvingsAfter = await models.ItemShelvingSale.find(null, options);
+ const saleTrackingsAfter = await models.SaleTracking.find(null, options);
+
+ expect(result).toEqual(true);
+ expect(saleTrackingsAfter.length).toBeLessThan(saleTrackingsBefore.length);
+ expect(itemShelvingsAfter.length).toBeLessThan(itemShelvingsBefore.length);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+});
diff --git a/modules/ticket/back/methods/sale-tracking/specs/filter.spec.js b/modules/ticket/back/methods/sale-tracking/specs/filter.spec.js
new file mode 100644
index 000000000..8a679f3a5
--- /dev/null
+++ b/modules/ticket/back/methods/sale-tracking/specs/filter.spec.js
@@ -0,0 +1,23 @@
+const app = require('vn-loopback/server/server');
+
+describe('sale-tracking filter()', () => {
+ it('should return 1 result filtering by ticket id', async() => {
+ const tx = await app.models.Claim.beginTransaction({});
+
+ try {
+ const options = {transaction: tx};
+
+ const id = 1;
+ const filter = {order: ['concept ASC', 'quantity DESC']};
+ const result = await app.models.SaleTracking.filter(id, filter, options);
+
+ expect(result.length).toEqual(4);
+ expect(result[0].ticketFk).toEqual(1);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+});
diff --git a/modules/ticket/back/methods/sale-tracking/specs/listSaleTracking.spec.js b/modules/ticket/back/methods/sale-tracking/specs/listSaleTracking.spec.js
index d51c56874..89f274c57 100644
--- a/modules/ticket/back/methods/sale-tracking/specs/listSaleTracking.spec.js
+++ b/modules/ticket/back/methods/sale-tracking/specs/listSaleTracking.spec.js
@@ -1,6 +1,6 @@
const models = require('vn-loopback/server/server').models;
-describe('ticket listSaleTracking()', () => {
+describe('sale-tracking listSaleTracking()', () => {
it('should call the listSaleTracking method and return the response', async() => {
const tx = await models.SaleTracking.beginTransaction({});
diff --git a/modules/ticket/back/methods/sale-tracking/specs/new.spec.js b/modules/ticket/back/methods/sale-tracking/specs/new.spec.js
new file mode 100644
index 000000000..fcd383582
--- /dev/null
+++ b/modules/ticket/back/methods/sale-tracking/specs/new.spec.js
@@ -0,0 +1,49 @@
+const models = require('vn-loopback/server/server').models;
+
+describe('sale-tracking new()', () => {
+ it('should update a saleTracking', async() => {
+ const tx = await models.SaleTracking.beginTransaction({});
+
+ try {
+ const options = {transaction: tx};
+ const ctx = {req: {accessToken: {userId: 55}}};
+
+ const saleFk = 1;
+ const isChecked = true;
+ const quantity = 20;
+ const stateCode = 'PREPARED';
+ const result = await models.SaleTracking.new(ctx, saleFk, isChecked, quantity, stateCode, options);
+
+ expect(result.isChecked).toBe(true);
+ expect(result.originalQuantity).toBe(20);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+
+ it('should create a saleTracking', async() => {
+ const tx = await models.SaleTracking.beginTransaction({});
+
+ try {
+ const options = {transaction: tx};
+ const ctx = {req: {accessToken: {userId: 1}}};
+
+ const saleFk = 1;
+ const isChecked = true;
+ const quantity = 20;
+ const stateCode = 'PREPARED';
+ const result = await models.SaleTracking.new(ctx, saleFk, isChecked, quantity, stateCode, options);
+
+ expect(result.isChecked).toBe(true);
+ expect(result.originalQuantity).toBe(20);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+});
diff --git a/modules/ticket/back/methods/sale/salePreparingList.js b/modules/ticket/back/methods/sale/salePreparingList.js
deleted file mode 100644
index e6e7d5164..000000000
--- a/modules/ticket/back/methods/sale/salePreparingList.js
+++ /dev/null
@@ -1,33 +0,0 @@
-module.exports = Self => {
- Self.remoteMethodCtx('salePreparingList', {
- description: 'Returns a list with the lines of a ticket and its different states of preparation',
- accessType: 'READ',
- accepts: [{
- arg: 'id',
- type: 'number',
- required: true,
- description: 'The ticket id',
- http: {source: 'path'}
- }],
- returns: {
- type: ['object'],
- root: true
- },
- http: {
- path: `/:id/salePreparingList`,
- verb: 'GET'
- }
- });
-
- Self.salePreparingList = async(ctx, id, options) => {
- const myOptions = {};
-
- if (typeof options == 'object')
- Object.assign(myOptions, options);
-
- query = `CALL vn.salePreparingList(?)`;
- const [sales] = await Self.rawSql(query, [id], myOptions);
-
- return sales;
- };
-};
diff --git a/modules/ticket/back/methods/sale/specs/getClaimableFromTicket.spec.js b/modules/ticket/back/methods/sale/specs/getClaimableFromTicket.spec.js
index d7eda9965..7939c0bbe 100644
--- a/modules/ticket/back/methods/sale/specs/getClaimableFromTicket.spec.js
+++ b/modules/ticket/back/methods/sale/specs/getClaimableFromTicket.spec.js
@@ -9,7 +9,7 @@ describe('sale getClaimableFromTicket()', () => {
const claimableFromTicket = await models.Sale.getClaimableFromTicket(16, options);
- expect(claimableFromTicket[0].concept).toBe('Ranged weapon longbow 2m');
+ expect(claimableFromTicket[0].concept).toBe('Ranged weapon longbow 200cm');
expect(claimableFromTicket.length).toBe(3);
await tx.rollback();
diff --git a/modules/ticket/back/methods/ticket-request/getItemTypeWorker.js b/modules/ticket/back/methods/ticket-request/getItemTypeWorker.js
index 9ea859f7c..f160cfaac 100644
--- a/modules/ticket/back/methods/ticket-request/getItemTypeWorker.js
+++ b/modules/ticket/back/methods/ticket-request/getItemTypeWorker.js
@@ -22,9 +22,13 @@ module.exports = Self => {
}
});
- Self.getItemTypeWorker = async filter => {
+ Self.getItemTypeWorker = async(filter, options) => {
+ const myOptions = {};
const conn = Self.dataSource.connector;
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
+
const query =
`SELECT DISTINCT u.id, u.nickname
FROM itemType it
diff --git a/modules/ticket/back/methods/ticket/docuwareDownload.js b/modules/ticket/back/methods/ticket/docuwareDownload.js
index e9b74b1a9..7084bbdd4 100644
--- a/modules/ticket/back/methods/ticket/docuwareDownload.js
+++ b/modules/ticket/back/methods/ticket/docuwareDownload.js
@@ -32,6 +32,14 @@ module.exports = Self => {
});
Self.docuwareDownload = async id => {
+ const models = Self.app.models;
+ const docuwareInfo = await models.Docuware.findOne({
+ where: {
+ code: 'deliveryNote',
+ action: 'find'
+ }
+ });
+
const filter = {
condition: [
{
@@ -50,6 +58,6 @@ module.exports = Self => {
}
]
};
- return Self.app.models.Docuware.download(id, 'deliveryNote', filter);
+ return models.Docuware.download(id, 'deliveryNote', filter);
};
};
diff --git a/modules/ticket/back/methods/ticket/priceDifference.js b/modules/ticket/back/methods/ticket/priceDifference.js
index 495e9e1aa..7dc85bd3d 100644
--- a/modules/ticket/back/methods/ticket/priceDifference.js
+++ b/modules/ticket/back/methods/ticket/priceDifference.js
@@ -1,3 +1,5 @@
+const UserError = require('vn-loopback/util/user-error');
+
module.exports = Self => {
Self.remoteMethodCtx('priceDifference', {
description: 'Returns sales with price difference if the ticket is editable',
diff --git a/modules/ticket/back/methods/ticket/saveSign.js b/modules/ticket/back/methods/ticket/saveSign.js
index 55d2e3281..9888328e7 100644
--- a/modules/ticket/back/methods/ticket/saveSign.js
+++ b/modules/ticket/back/methods/ticket/saveSign.js
@@ -93,6 +93,8 @@ module.exports = Self => {
}, myOptions);
const dmsType = await models.DmsType.findOne({where: {code: 'Ticket'}, fields: ['id']}, myOptions);
const ctxUploadFile = Object.assign({}, ctx);
+ if (ticket.route() === null)
+ throw new UserError('Ticket without route');
ctxUploadFile.args = {
warehouseId: ticket.warehouseFk,
companyId: ticket.companyFk,
diff --git a/modules/ticket/back/model-config.json b/modules/ticket/back/model-config.json
index 3c7e12eea..83d7303b7 100644
--- a/modules/ticket/back/model-config.json
+++ b/modules/ticket/back/model-config.json
@@ -20,6 +20,9 @@
"ExpeditionState": {
"dataSource": "vn"
},
+ "ExpeditionStateType": {
+ "dataSource": "vn"
+ },
"Packaging": {
"dataSource": "vn"
},
diff --git a/modules/ticket/back/models/expedition-state-type.json b/modules/ticket/back/models/expedition-state-type.json
new file mode 100644
index 000000000..70207568b
--- /dev/null
+++ b/modules/ticket/back/models/expedition-state-type.json
@@ -0,0 +1,22 @@
+{
+ "name": "ExpeditionStateType",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "expeditionStateType"
+ }
+ },
+ "properties": {
+ "id": {
+ "id": true,
+ "type": "number",
+ "description": "Identifier"
+ },
+ "description": {
+ "type": "string"
+ },
+ "code": {
+ "type": "string"
+ }
+ }
+}
\ No newline at end of file
diff --git a/modules/ticket/back/models/expedition-state.js b/modules/ticket/back/models/expedition-state.js
index af76af718..496dd88d3 100644
--- a/modules/ticket/back/models/expedition-state.js
+++ b/modules/ticket/back/models/expedition-state.js
@@ -1,3 +1,4 @@
module.exports = function(Self) {
require('../methods/expedition-state/filter')(Self);
+ require('../methods/expedition-state/addExpeditionState')(Self);
};
diff --git a/modules/ticket/back/models/sale-tracking.js b/modules/ticket/back/models/sale-tracking.js
index 4a46dd6b7..54a2b5a1a 100644
--- a/modules/ticket/back/models/sale-tracking.js
+++ b/modules/ticket/back/models/sale-tracking.js
@@ -1,3 +1,6 @@
module.exports = Self => {
+ require('../methods/sale-tracking/filter')(Self);
require('../methods/sale-tracking/listSaleTracking')(Self);
+ require('../methods/sale-tracking/new')(Self);
+ require('../methods/sale-tracking/delete')(Self);
};
diff --git a/modules/ticket/back/models/sale.js b/modules/ticket/back/models/sale.js
index bab201fdd..ae247fc24 100644
--- a/modules/ticket/back/models/sale.js
+++ b/modules/ticket/back/models/sale.js
@@ -1,6 +1,5 @@
module.exports = Self => {
require('../methods/sale/getClaimableFromTicket')(Self);
- require('../methods/sale/salePreparingList')(Self);
require('../methods/sale/reserve')(Self);
require('../methods/sale/deleteSales')(Self);
require('../methods/sale/updatePrice')(Self);
diff --git a/modules/ticket/back/models/ticket-methods.js b/modules/ticket/back/models/ticket-methods.js
index c37337253..14cb104be 100644
--- a/modules/ticket/back/models/ticket-methods.js
+++ b/modules/ticket/back/models/ticket-methods.js
@@ -42,4 +42,5 @@ module.exports = function(Self) {
require('../methods/ticket/expeditionPalletLabel')(Self);
require('../methods/ticket/saveSign')(Self);
require('../methods/ticket/invoiceTickets')(Self);
+ require('../methods/ticket/docuwareDownload')(Self);
};
diff --git a/modules/ticket/front/descriptor-menu/index.js b/modules/ticket/front/descriptor-menu/index.js
index 360d93564..d1f39fd19 100644
--- a/modules/ticket/front/descriptor-menu/index.js
+++ b/modules/ticket/front/descriptor-menu/index.js
@@ -3,10 +3,11 @@ import Section from 'salix/components/section';
import './style.scss';
class Controller extends Section {
- constructor($element, $, vnReport, vnEmail) {
+ constructor($element, $, vnReport, vnEmail, vnFile) {
super($element, $);
this.vnReport = vnReport;
this.vnEmail = vnEmail;
+ this.vnFile = vnFile;
}
get ticketId() {
@@ -322,7 +323,7 @@ class Controller extends Section {
}
docuwareDownload() {
- this.vnFile.download(`api/Ticket/${this.ticket.id}/docuwareDownload`);
+ this.vnFile.download(`api/Tickets/${this.ticket.id}/docuwareDownload`);
}
setTicketWeight(weight) {
@@ -335,7 +336,7 @@ class Controller extends Section {
}
}
-Controller.$inject = ['$element', '$scope', 'vnReport', 'vnEmail'];
+Controller.$inject = ['$element', '$scope', 'vnReport', 'vnEmail', 'vnFile'];
ngModule.vnComponent('vnTicketDescriptorMenu', {
template: require('./index.html'),
diff --git a/modules/ticket/front/sale-tracking/index.html b/modules/ticket/front/sale-tracking/index.html
index 0309dde13..f05cf15fb 100644
--- a/modules/ticket/front/sale-tracking/index.html
+++ b/modules/ticket/front/sale-tracking/index.html
@@ -1,11 +1,19 @@
+
+
+
+
@@ -13,7 +21,7 @@
- Is checked
+ Is checked
Item
Description
Quantity
@@ -23,76 +31,84 @@
-
+
+ ng-class="{
+ 'pink': sale.hasSaleGroupDetail,
+ 'none': !sale.hasSaleGroupDetail,
+ }"
+ class="circleState"
+ vn-tooltip="sale group detail"
+ vn-click-stop="$ctrl.clickSaleGroupDetail($index)">
-
+
-
+
-
+
-
+
-
+
- {{::sale.item.id}}
+ {{::sale.itemFk}}
- {{::sale.item.name}}
-
- {{::sale.item.subName}}
+ {{::sale.concept}}
+
+ {{::sale.subName}}
{{::sale.quantity}}
- {{::sale.saleGroupDetail.saleGroup.parking.code | dashIfEmpty}}
+ {{::sale.parkingCode | dashIfEmpty}}
@@ -154,28 +170,35 @@
-
-
-
+
+
Quantity
Worker
- Shelving
- Parking
+ Shelving
+ Parking
Created
- {{::itemShelvingSale.quantity}}
+
+ {{itemShelvingSale.quantity}}
+
+
+
+
+
- {{::itemShelvingSale.shelvingFk}}
- {{::itemShelvingSale.code}}
+
+
+
+
+
+
+
+
{{::itemShelvingSale.created | date: 'dd/MM/yyyy HH:mm'}}
diff --git a/modules/ticket/front/sale-tracking/index.js b/modules/ticket/front/sale-tracking/index.js
index 60b422cc0..6c0e7232e 100644
--- a/modules/ticket/front/sale-tracking/index.js
+++ b/modules/ticket/front/sale-tracking/index.js
@@ -3,62 +3,6 @@ import Section from 'salix/components/section';
import './style.scss';
class Controller extends Section {
- constructor($element, $) {
- super($element, $);
- this.filter = {
- include: [
- {
- relation: 'item'
- },
- {
- relation: 'saleTracking',
- scope: {
- fields: ['isChecked']
- }
- },
- {
- relation: 'saleGroupDetail',
- scope: {
- fields: ['saleGroupFk'],
- include: {
- relation: 'saleGroup',
- scope: {
- fields: ['parkingFk'],
- include: {
- relation: 'parking',
- scope: {
- fields: ['code']
- }
- }
- }
- }
- }
- }
- ]
- };
- }
-
- get sales() {
- return this._sales;
- }
-
- set sales(value) {
- this._sales = value;
- if (value) {
- const query = `Sales/${this.$params.id}/salePreparingList`;
- this.$http.get(query)
- .then(res => {
- this.salePreparingList = res.data;
- for (const salePreparing of this.salePreparingList) {
- for (const sale of this.sales) {
- if (salePreparing.saleFk == sale.id)
- sale.preparingList = salePreparing;
- }
- }
- });
- }
- }
-
showItemDescriptor(event, sale) {
this.quicklinks = {
btnThree: {
@@ -75,20 +19,145 @@ class Controller extends Section {
}
showSaleTracking(sale) {
- this.saleId = sale.id;
+ this.saleId = sale.saleFk;
this.$.saleTracking.show();
}
showItemShelvingSale(sale) {
- this.saleId = sale.id;
+ this.saleId = sale.saleFk;
this.$.itemShelvingSale.show();
}
+
+ clickSaleGroupDetail(index) {
+ const sale = this.sales[index];
+ if (!sale.saleGroupDetailFk) return;
+
+ return this.$http.delete(`SaleGroupDetails/${sale.saleGroupDetailFk}`)
+ .then(() => {
+ sale.hasSaleGroupDetail = false;
+ this.vnApp.showSuccess(this.$t('Data saved!'));
+ });
+ }
+
+ clickPreviousSelected(index) {
+ const sale = this.sales[index];
+ if (!sale.isPreviousSelected) {
+ this.saleTrackingNew(sale, 'PREVIOUS_PREPARATION', false);
+ sale.isPreviousSelected = true;
+ } else {
+ this.saleTrackingDel(sale, 'PREVIOUS_PREPARATION');
+ sale.isPreviousSelected = false;
+ sale.isPrevious = false;
+ }
+ }
+
+ clickPrevious(index) {
+ const sale = this.sales[index];
+ if (!sale.isPrevious) {
+ this.saleTrackingNew(sale, 'PREVIOUS_PREPARATION', true);
+ sale.isPrevious = true;
+ sale.isPreviousSelected = true;
+ } else {
+ this.saleTrackingNew(sale, 'PREVIOUS_PREPARATION', false);
+ sale.isPrevious = false;
+ }
+ }
+
+ clickPrepared(index) {
+ const sale = this.sales[index];
+ if (!sale.isPrepared) {
+ this.saleTrackingNew(sale, 'PREPARED', true);
+ sale.isPrepared = true;
+ } else {
+ this.saleTrackingDel(sale, 'PREPARED');
+ sale.isPrepared = false;
+ }
+ }
+
+ clickControled(index) {
+ const sale = this.sales[index];
+ if (!sale.isControled) {
+ this.saleTrackingNew(sale, 'CHECKED', true);
+ sale.isControled = true;
+ } else {
+ this.saleTrackingDel(sale, 'CHECKED');
+ sale.isControled = false;
+ }
+ }
+
+ saleTrackingNew(sale, stateCode, isChecked) {
+ const params = {
+ saleFk: sale.saleFk,
+ isChecked: isChecked,
+ quantity: sale.quantity,
+ stateCode: stateCode
+ };
+ this.$http.post(`SaleTrackings/new`, params).then(() => {
+ this.vnApp.showSuccess(this.$t('Data saved!'));
+ });
+ }
+
+ saleTrackingDel(sale, stateCode) {
+ const params = {
+ saleFk: sale.saleFk,
+ stateCode: stateCode
+ };
+ this.$http.post(`SaleTrackings/delete`, params).then(() => {
+ this.vnApp.showSuccess(this.$t('Data saved!'));
+ });
+ }
+
+ updateQuantity(itemShelvingSale) {
+ const params = {
+ quantity: itemShelvingSale.quantity
+ };
+ this.$http.patch(`ItemShelvingSales/${itemShelvingSale.id}`, params)
+ .then(() => {
+ this.vnApp.showSuccess(this.$t('Data saved!'));
+ });
+ }
+
+ async updateShelving(itemShelvingSale) {
+ const params = {
+ shelvingFk: itemShelvingSale.shelvingFk
+ };
+ const res = await this.$http.patch(`ItemShelvings/${itemShelvingSale.itemShelvingFk}`, params);
+
+ const filter = {
+ fields: ['parkingFk'],
+ where: {
+ code: res.data.shelvingFk
+ }
+ };
+ this.$http.get(`Shelvings/findOne`, {filter})
+ .then(res => {
+ itemShelvingSale.parkingFk = res.data.parkingFk;
+ this.vnApp.showSuccess(this.$t('Data saved!'));
+ });
+ }
+
+ async updateParking(itemShelvingSale) {
+ const filter = {
+ fields: ['id'],
+ where: {
+ code: itemShelvingSale.shelvingFk
+ }
+ };
+ const res = await this.$http.get(`Shelvings/findOne`, {filter});
+
+ const params = {
+ parkingFk: itemShelvingSale.parkingFk
+ };
+ this.$http.patch(`Shelvings/${res.data.id}`, params)
+ .then(() => this.vnApp.showSuccess(this.$t('Data saved!')));
+ }
}
ngModule.vnComponent('vnTicketSaleTracking', {
template: require('./index.html'),
controller: Controller,
bindings: {
- ticket: '<'
+ ticket: '<',
+ model: '
@@ -43,4 +36,4 @@
ui-sref="ticket.card.tracking.index">
-
\ No newline at end of file
+
diff --git a/modules/worker/back/methods/worker-time-control/sendMail.js b/modules/worker/back/methods/worker-time-control/sendMail.js
index 331c81512..2c5143612 100644
--- a/modules/worker/back/methods/worker-time-control/sendMail.js
+++ b/modules/worker/back/methods/worker-time-control/sendMail.js
@@ -121,15 +121,18 @@ module.exports = Self => {
`, [started, ended]);
stmts.push(stmt);
- stmt = new ParameterizedSQL(`INSERT INTO mail (receiver, subject, body)
- SELECT CONCAT(u.name, '@verdnatura.es'),
- CONCAT('Error registro de horas semana ', ?, ' año ', ?) ,
- CONCAT('No se ha podido enviar el registro de horas al empleado/s: ', GROUP_CONCAT(DISTINCT CONCAT('
', w.id, ' ', w.firstName, ' ', w.lastName)))
- FROM tmp.timeControlError tce
- JOIN vn.workerTimeControl wtc ON wtc.id = tce.id
- JOIN worker w ON w.id = wtc.userFK
- JOIN account.user u ON u.id = w.bossFk
- GROUP BY w.bossFk`, [args.week, args.year]);
+ stmt = new ParameterizedSQL(`
+ INSERT INTO mail (receiver, subject, body)
+ SELECT CONCAT(u.name, '@verdnatura.es'),
+ CONCAT('Error registro de horas semana ', ?, ' año ', ?) ,
+ CONCAT('No se ha podido enviar el registro de horas al empleado/s: ',
+ GROUP_CONCAT(DISTINCT CONCAT('
', w.id, ' ', w.firstName, ' ', w.lastName)))
+ FROM tmp.timeControlError tce
+ JOIN vn.workerTimeControl wtc ON wtc.id = tce.id
+ JOIN worker w ON w.id = wtc.userFK
+ JOIN account.user u ON u.id = w.bossFk
+ GROUP BY w.bossFk
+ `, [args.week, args.year]);
stmts.push(stmt);
stmt = new ParameterizedSQL(`
@@ -177,10 +180,8 @@ module.exports = Self => {
const workerTimeControlConfig = await models.WorkerTimeControlConfig.findOne(null, myOptions);
for (let day of days[index]) {
- if (!myOptions.transaction) {
- tx = await Self.beginTransaction({});
- myOptions.transaction = tx;
- }
+ tx = await Self.beginTransaction({});
+ myOptions.transaction = tx;
try {
workerFk = day.workerFk;
if (day.timeWorkDecimal > 0 && day.timeWorkedDecimal == null
@@ -365,13 +366,31 @@ module.exports = Self => {
previousReceiver = day.receiver;
}
- if (tx) {
- await tx.commit();
- delete myOptions.transaction;
- }
+ if (tx) await tx.commit();
} catch (e) {
+ const stmts = [];
+ let stmt;
+ stmt = new ParameterizedSQL(`
+ INSERT INTO mail (receiver, subject, body)
+ SELECT CONCAT(u.name, '@verdnatura.es'),
+ CONCAT('Error registro de horas semana ', ?, ' año ', ?) ,
+ CONCAT('No se ha podido enviar el registro de horas al empleado: ',
+ w.id, ' ', w.firstName, ' ', w.lastName, ' por el motivo: ', ?)
+ FROM worker w
+ JOIN account.user u ON u.id = w.bossFk
+ WHERE w.id = ?
+ `, [args.week, args.year, e.message, day.workerFk]);
+ stmts.push(stmt);
+
+ const sql = ParameterizedSQL.join(stmts, ';');
+ await conn.executeStmt(sql);
+
+ previousWorkerFk = day.workerFk;
+ previousReceiver = day.receiver;
+
if (tx) await tx.rollback();
- throw e;
+
+ continue;
}
}
diff --git a/modules/worker/back/methods/worker-time-control/weeklyHourRecordEmail.js b/modules/worker/back/methods/worker-time-control/weeklyHourRecordEmail.js
index f44080559..3203dea82 100644
--- a/modules/worker/back/methods/worker-time-control/weeklyHourRecordEmail.js
+++ b/modules/worker/back/methods/worker-time-control/weeklyHourRecordEmail.js
@@ -51,7 +51,7 @@ module.exports = Self => {
const salix = await models.Url.findOne({
where: {
appName: 'salix',
- environment: process.env.NODE_ENV || 'dev'
+ environment: process.env.NODE_ENV || 'development'
}
}, myOptions);
@@ -61,7 +61,7 @@ module.exports = Self => {
const url = `${salix.url}worker/${args.workerId}/time-control?timestamp=${timestamp}`;
ctx.args.url = url;
- Self.sendTemplate(ctx, 'weekly-hour-record');
+ await Self.sendTemplate(ctx, 'weekly-hour-record');
return models.WorkerTimeControl.updateWorkerTimeControlMail(ctx, myOptions);
};
diff --git a/modules/worker/back/methods/worker/activeWithInheritedRole.js b/modules/worker/back/methods/worker/activeWithInheritedRole.js
index 2b75a939e..9bd02fec8 100644
--- a/modules/worker/back/methods/worker/activeWithInheritedRole.js
+++ b/modules/worker/back/methods/worker/activeWithInheritedRole.js
@@ -1,7 +1,7 @@
module.exports = Self => {
Self.remoteMethod('activeWithInheritedRole', {
- description: 'Returns active workers with a role',
+ description: 'Returns active workers with an inherited role',
accessType: 'READ',
accepts: [{
arg: 'filter',
diff --git a/modules/worker/back/methods/worker/activeWithRole.js b/modules/worker/back/methods/worker/activeWithRole.js
index 392416458..c7f96e151 100644
--- a/modules/worker/back/methods/worker/activeWithRole.js
+++ b/modules/worker/back/methods/worker/activeWithRole.js
@@ -1,7 +1,7 @@
module.exports = Self => {
Self.remoteMethod('activeWithRole', {
- description: 'Returns active workers with an inherited role',
+ description: 'Returns active workers with a role',
accessType: 'READ',
accepts: [{
arg: 'filter',
diff --git a/modules/worker/back/methods/worker/search.js b/modules/worker/back/methods/worker/search.js
new file mode 100644
index 000000000..cd0a466ea
--- /dev/null
+++ b/modules/worker/back/methods/worker/search.js
@@ -0,0 +1,69 @@
+const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
+const mergeFilters = require('vn-loopback/util/filter').mergeFilters;
+
+module.exports = Self => {
+ Self.remoteMethodCtx('search', {
+ description: 'Returns an array of search results for a specified worker',
+ accepts: [{
+ arg: 'filter',
+ type: 'object',
+ description: 'Filter to define conditions and paginate the data.',
+ required: true
+ },
+ {
+ arg: 'departmentCodes',
+ type: ['string'],
+ description: 'Department codes to search workers',
+ }],
+ returns: {
+ type: ['object'],
+ root: true
+ },
+ http: {
+ path: `/search`,
+ verb: 'GET'
+ }
+ });
+
+ Self.search = async(ctx, filter, departmentCodes) => {
+ const models = Self.app.models;
+ const conn = Self.dataSource.connector;
+
+ if (departmentCodes) {
+ const departments = await models.Department.find({
+ fields: ['id', 'sons'],
+ where: {code: {inq: departmentCodes}}
+ });
+
+ const allLeaves = await getAllLeaves(ctx, departments);
+ const where = {'departmentFk': {inq: allLeaves}};
+ filter = mergeFilters(filter, {where});
+ }
+
+ const stmt = new ParameterizedSQL(`
+ SELECT *
+ FROM(
+ SELECT DISTINCT w.id, w.code, u.name, u.nickname, u.active, b.departmentFk
+ FROM worker w
+ JOIN account.user u ON u.id = w.id
+ JOIN business b ON b.workerFk = w.id
+ ) w`);
+
+ stmt.merge(conn.makeSuffix(filter));
+ return conn.executeStmt(stmt);
+ };
+
+ async function getAllLeaves(ctx, departments) {
+ const models = Self.app.models;
+ const leaves = [];
+ for (const department of departments) {
+ if (department.sons > 0) {
+ const subLeaves = await models.Department.getLeaves(ctx, department.id, null);
+ const grandLeaves = await getAllLeaves(ctx, subLeaves);
+ leaves.push(...grandLeaves);
+ }
+ leaves.push(department.id);
+ }
+ return leaves;
+ }
+};
diff --git a/modules/worker/back/model-config.json b/modules/worker/back/model-config.json
index 60ec273a5..b261f895e 100644
--- a/modules/worker/back/model-config.json
+++ b/modules/worker/back/model-config.json
@@ -23,6 +23,9 @@
"Device": {
"dataSource": "vn"
},
+ "DeviceLog": {
+ "dataSource": "vn"
+ },
"DeviceProduction": {
"dataSource": "vn"
},
diff --git a/modules/worker/back/models/device-log.json b/modules/worker/back/models/device-log.json
new file mode 100644
index 000000000..9278b9038
--- /dev/null
+++ b/modules/worker/back/models/device-log.json
@@ -0,0 +1,40 @@
+{
+ "name": "DeviceLog",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "deviceLog"
+ }
+ },
+ "properties": {
+ "id": {
+ "id": true,
+ "type": "number"
+ },
+ "android_id": {
+ "type": "string"
+ },
+ "userFk": {
+ "type": "number"
+ },
+ "created": {
+ "type": "date"
+ },
+ "nameApp": {
+ "type": "string"
+ },
+ "versionApp": {
+ "type": "string"
+ },
+ "deviceProductionFk": {
+ "type": "number"
+ }
+ },
+ "relations": {
+ "user": {
+ "type": "belongsTo",
+ "model": "VnUser",
+ "foreignKey": "userFk"
+ }
+ }
+}
diff --git a/modules/worker/back/models/worker.js b/modules/worker/back/models/worker.js
index b44703a88..ccae3a6e6 100644
--- a/modules/worker/back/models/worker.js
+++ b/modules/worker/back/models/worker.js
@@ -16,6 +16,7 @@ module.exports = Self => {
require('../methods/worker/new')(Self);
require('../methods/worker/deallocatePDA')(Self);
require('../methods/worker/allocatePDA')(Self);
+ require('../methods/worker/search')(Self);
require('../methods/worker/isAuthorized')(Self);
Self.validatesUniquenessOf('locker', {
diff --git a/modules/worker/front/basic-data/index.html b/modules/worker/front/basic-data/index.html
index d89d88f2e..2d85d018d 100644
--- a/modules/worker/front/basic-data/index.html
+++ b/modules/worker/front/basic-data/index.html
@@ -37,14 +37,11 @@
-
-
+
-
+
+
{{absenceType.name}}
diff --git a/modules/worker/front/calendar/style.scss b/modules/worker/front/calendar/style.scss
index d92c54806..e99f64689 100644
--- a/modules/worker/front/calendar/style.scss
+++ b/modules/worker/front/calendar/style.scss
@@ -9,7 +9,7 @@ vn-worker-calendar {
align-items: center;
box-sizing: border-box;
padding: $spacing-md;
-
+
& > vn-calendar {
border: $border-thin;
margin: $spacing-md;
@@ -32,7 +32,7 @@ vn-worker-calendar {
}
vn-icon[icon="info"] {
- position: absolute;
+ position: absolute;
top: 16px;
right: 16px
}
@@ -40,7 +40,7 @@ vn-worker-calendar {
vn-side-menu div > .input {
border-bottom: $border-thin;
}
-
+
.festive,
vn-avatar.today {
color: $color-font;
@@ -56,4 +56,10 @@ vn-worker-calendar {
vn-avatar.today {
border: 2px solid $color-font-link
}
+
+ .check {
+ margin-top: 0.5px;
+ margin-left: -3px;
+ font-size: 125%;
+ }
}
diff --git a/modules/worker/front/create/index.html b/modules/worker/front/create/index.html
index 481746761..dd3e0b4a9 100644
--- a/modules/worker/front/create/index.html
+++ b/modules/worker/front/create/index.html
@@ -131,15 +131,12 @@
value-field="id"
label="Company">
-
-
+
-
-
+
-
+
@@ -78,12 +76,12 @@
label="Fill in days without physical check-ins"
ng-model="$ctrl.department.hasToRefill">
-
-
+
+
-
+
diff --git a/package.json b/package.json
index dd833a8ad..44a651af4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "salix-back",
- "version": "23.36.01",
+ "version": "23.38.01",
"author": "Verdnatura Levante SL",
"description": "Salix backend",
"license": "GPL-3.0",
diff --git a/print/templates/reports/entry-order/sql/supplier.sql b/print/templates/reports/entry-order/sql/supplier.sql
index 11a2bc602..81ed7e883 100644
--- a/print/templates/reports/entry-order/sql/supplier.sql
+++ b/print/templates/reports/entry-order/sql/supplier.sql
@@ -8,4 +8,4 @@ SELECT
FROM supplier s
JOIN entry e ON e.supplierFk = s.id
LEFT JOIN province p ON p.id = s.provinceFk
-WHERE e.id = ?
\ No newline at end of file
+WHERE e.id = ?
diff --git a/print/templates/reports/invoiceIn/invoiceIn.html b/print/templates/reports/invoiceIn/invoiceIn.html
index 8f072947f..a86fd42b0 100644
--- a/print/templates/reports/invoiceIn/invoiceIn.html
+++ b/print/templates/reports/invoiceIn/invoiceIn.html
@@ -32,6 +32,7 @@
{{invoice.name}}
{{invoice.postalAddress}}
{{invoice.postcodeCity}}
+ {{invoice.postCode}}, {{invoice.city}}, ({{invoice.province}})
{{$t('fiscalId')}}: {{invoice.nif}}
{{$t('phone')}}: {{invoice.phone}}
diff --git a/print/templates/reports/invoiceIn/sql/invoice.sql b/print/templates/reports/invoiceIn/sql/invoice.sql
index dae979011..82eeebce0 100644
--- a/print/templates/reports/invoiceIn/sql/invoice.sql
+++ b/print/templates/reports/invoiceIn/sql/invoice.sql
@@ -4,6 +4,9 @@ SELECT
i.issued,
s.name,
s.street AS postalAddress,
+ s.city,
+ s.postCode,
+ pr.name province,
s.nif,
s.phone,
p.name payMethod
@@ -11,4 +14,5 @@ SELECT
JOIN supplier s ON s.id = i.supplierFk
JOIN company c ON c.id = i.companyFk
JOIN payMethod p ON p.id = s.payMethodFk
+ LEFT JOIN province pr ON pr.id = s.provinceFk
WHERE i.id = ?