\ 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 597c6edabb..5cba11d3c2 100644
--- a/modules/supplier/front/consumption-search-panel/index.html
+++ b/modules/supplier/front/consumption-search-panel/index.html
@@ -17,12 +17,11 @@
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 0000000000..f1199f1888
--- /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 0000000000..819a43a605
--- /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/sale-tracking/delete.js b/modules/ticket/back/methods/sale-tracking/delete.js
new file mode 100644
index 0000000000..0b977e5d44
--- /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 0000000000..2fa21cb1a8
--- /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 0000000000..6a99c299c4
--- /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 0000000000..a8bcf56928
--- /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 0000000000..8a679f3a56
--- /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 d51c56874e..89f274c57b 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 0000000000..fcd3835821
--- /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/refund.js b/modules/ticket/back/methods/sale/refund.js
index a8191610ac..12f240ae24 100644
--- a/modules/ticket/back/methods/sale/refund.js
+++ b/modules/ticket/back/methods/sale/refund.js
@@ -67,8 +67,12 @@ module.exports = Self => {
const sales = await models.Sale.find(salesFilter, myOptions);
const ticketsIds = [...new Set(sales.map(sale => sale.ticketFk))];
+ let [firstTicketId] = ticketsIds;
+ if (!firstTicketId) {
+ [ticketServices] = await models.TicketService.find({where: {id: {inq: servicesIds}}}, myOptions);
+ firstTicketId = ticketServices.ticketFk;
+ }
const now = Date.vnNew();
- const [firstTicketId] = ticketsIds;
const refundTicket = await createTicketRefund(firstTicketId, now, refundAgencyMode, refoundZoneId, withWarehouse, myOptions);
diff --git a/modules/ticket/back/methods/sale/salePreparingList.js b/modules/ticket/back/methods/sale/salePreparingList.js
deleted file mode 100644
index e6e7d5164c..0000000000
--- 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/ticket-request/getItemTypeWorker.js b/modules/ticket/back/methods/ticket-request/getItemTypeWorker.js
index 0655c7bba4..f160cfaaca 100644
--- a/modules/ticket/back/methods/ticket-request/getItemTypeWorker.js
+++ b/modules/ticket/back/methods/ticket-request/getItemTypeWorker.js
@@ -1,7 +1,9 @@
const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
+const buildFilter = require('vn-loopback/util/filter').buildFilter;
+const mergeFilters = require('vn-loopback/util/filter').mergeFilters;
module.exports = Self => {
- Self.remoteMethodCtx('getItemTypeWorker', {
+ Self.remoteMethod('getItemTypeWorker', {
description: 'Returns the workers that appear in itemType',
accessType: 'READ',
accepts: [{
@@ -20,10 +22,9 @@ module.exports = Self => {
}
});
- Self.getItemTypeWorker = async(ctx, filter, options) => {
+ Self.getItemTypeWorker = async(filter, options) => {
const myOptions = {};
const conn = Self.dataSource.connector;
- let tx;
if (typeof options == 'object')
Object.assign(myOptions, options);
@@ -33,25 +34,29 @@ module.exports = Self => {
FROM itemType it
JOIN worker w ON w.id = it.workerFk
JOIN account.user u ON u.id = w.id`;
+ const stmt = new ParameterizedSQL(query);
- let stmt = new ParameterizedSQL(query);
-
- if (filter.where) {
- const value = filter.where.firstName;
- const myFilter = {
- where: {or: [
+ filter.where = buildFilter(filter.where, (param, value) => {
+ switch (param) {
+ case 'firstName':
+ return {or: [
{'w.firstName': {like: `%${value}%`}},
{'w.lastName': {like: `%${value}%`}},
{'u.name': {like: `%${value}%`}},
{'u.nickname': {like: `%${value}%`}}
- ]}
- };
+ ]};
+ case 'id':
+ return {'w.id': value};
+ }
+ });
- stmt.merge(conn.makeSuffix(myFilter));
- }
+ let myFilter = {
+ where: {'u.active': true}
+ };
- if (tx) await tx.commit();
+ myFilter = mergeFilters(myFilter, filter);
+ stmt.merge(conn.makeSuffix(myFilter));
return conn.executeStmt(stmt);
};
};
diff --git a/modules/ticket/back/methods/ticket-request/specs/getItemTypeWorkers.spec.js b/modules/ticket/back/methods/ticket-request/specs/getItemTypeWorkers.spec.js
index ae5c508b6d..c57451c261 100644
--- a/modules/ticket/back/methods/ticket-request/specs/getItemTypeWorkers.spec.js
+++ b/modules/ticket/back/methods/ticket-request/specs/getItemTypeWorkers.spec.js
@@ -1,12 +1,10 @@
const models = require('vn-loopback/server/server').models;
describe('ticket-request getItemTypeWorker()', () => {
- const ctx = {req: {accessToken: {userId: 18}}};
-
it('should return the buyer as result', async() => {
const filter = {where: {firstName: 'buyer'}};
- const result = await models.TicketRequest.getItemTypeWorker(ctx, filter);
+ const result = await models.TicketRequest.getItemTypeWorker(filter);
expect(result.length).toEqual(1);
});
@@ -14,7 +12,7 @@ describe('ticket-request getItemTypeWorker()', () => {
it('should return the workers at itemType as result', async() => {
const filter = {};
- const result = await models.TicketRequest.getItemTypeWorker(ctx, filter);
+ const result = await models.TicketRequest.getItemTypeWorker(filter);
expect(result.length).toBeGreaterThan(1);
});
diff --git a/modules/ticket/back/methods/ticket/addSale.js b/modules/ticket/back/methods/ticket/addSale.js
index 2cd02a8a41..cbf884273b 100644
--- a/modules/ticket/back/methods/ticket/addSale.js
+++ b/modules/ticket/back/methods/ticket/addSale.js
@@ -1,4 +1,3 @@
-
const UserError = require('vn-loopback/util/user-error');
module.exports = Self => {
@@ -47,9 +46,7 @@ module.exports = Self => {
}
try {
- const isEditable = await models.Ticket.isEditable(ctx, id, myOptions);
- if (!isEditable)
- throw new UserError(`The sales of this ticket can't be modified`);
+ await models.Ticket.isEditableOrThrow(ctx, id, myOptions);
const item = await models.Item.findById(itemId, null, myOptions);
const ticket = await models.Ticket.findById(id, {
diff --git a/modules/ticket/back/methods/ticket/canBeInvoiced.js b/modules/ticket/back/methods/ticket/canBeInvoiced.js
index 0f6cb476be..348f02348b 100644
--- a/modules/ticket/back/methods/ticket/canBeInvoiced.js
+++ b/modules/ticket/back/methods/ticket/canBeInvoiced.js
@@ -67,7 +67,7 @@ module.exports = function(Self) {
throw new UserError(`This ticket is already invoiced`);
const priceZero = ticket.totalWithVat == 0;
- if (priceZero)
+ if (ticketsIds.length == 1 && priceZero)
throw new UserError(`A ticket with an amount of zero can't be invoiced`);
});
diff --git a/modules/ticket/back/methods/ticket/closure.js b/modules/ticket/back/methods/ticket/closure.js
index eee5e28e26..9f9aec9bd1 100644
--- a/modules/ticket/back/methods/ticket/closure.js
+++ b/modules/ticket/back/methods/ticket/closure.js
@@ -5,177 +5,177 @@ const config = require('vn-print/core/config');
const storage = require('vn-print/core/storage');
module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
- const userId = ctx.req.accessToken.userId;
- if (tickets.length == 0) return;
+ const userId = ctx.req.accessToken.userId;
+ if (tickets.length == 0) return;
- const failedtickets = [];
- for (const ticket of tickets) {
- try {
- await Self.rawSql(`CALL vn.ticket_closeByTicket(?)`, [ticket.id], {userId});
+ const failedtickets = [];
+ for (const ticket of tickets) {
+ try {
+ await Self.rawSql(`CALL vn.ticket_closeByTicket(?)`, [ticket.id], {userId});
- const [invoiceOut] = await Self.rawSql(`
- SELECT io.id, io.ref, io.serial, cny.code companyCode, io.issued
- FROM ticket t
- JOIN invoiceOut io ON io.ref = t.refFk
- JOIN company cny ON cny.id = io.companyFk
- WHERE t.id = ?
- `, [ticket.id]);
+ const [invoiceOut] = await Self.rawSql(`
+ SELECT io.id, io.ref, io.serial, cny.code companyCode, io.issued
+ FROM ticket t
+ JOIN invoiceOut io ON io.ref = t.refFk
+ JOIN company cny ON cny.id = io.companyFk
+ WHERE t.id = ?
+ `, [ticket.id]);
- const mailOptions = {
- overrideAttachments: true,
- attachments: []
- };
+ const mailOptions = {
+ overrideAttachments: true,
+ attachments: []
+ };
- const isToBeMailed = ticket.recipient && ticket.salesPersonFk && ticket.isToBeMailed;
+ const isToBeMailed = ticket.recipient && ticket.salesPersonFk && ticket.isToBeMailed;
- if (invoiceOut) {
- const args = {
- reference: invoiceOut.ref,
- recipientId: ticket.clientFk,
- recipient: ticket.recipient,
- replyTo: ticket.salesPersonEmail
- };
+ if (invoiceOut) {
+ const args = {
+ reference: invoiceOut.ref,
+ recipientId: ticket.clientFk,
+ recipient: ticket.recipient,
+ replyTo: ticket.salesPersonEmail
+ };
- const invoiceReport = new Report('invoice', args);
- const stream = await invoiceReport.toPdfStream();
+ const invoiceReport = new Report('invoice', args);
+ const stream = await invoiceReport.toPdfStream();
- const issued = invoiceOut.issued;
- const year = issued.getFullYear().toString();
- const month = (issued.getMonth() + 1).toString();
- const day = issued.getDate().toString();
+ const issued = invoiceOut.issued;
+ const year = issued.getFullYear().toString();
+ const month = (issued.getMonth() + 1).toString();
+ const day = issued.getDate().toString();
- const fileName = `${year}${invoiceOut.ref}.pdf`;
+ const fileName = `${year}${invoiceOut.ref}.pdf`;
- // Store invoice
- await storage.write(stream, {
- type: 'invoice',
- path: `${year}/${month}/${day}`,
- fileName: fileName
- });
+ // Store invoice
+ await storage.write(stream, {
+ type: 'invoice',
+ path: `${year}/${month}/${day}`,
+ fileName: fileName
+ });
- await Self.rawSql('UPDATE invoiceOut SET hasPdf = true WHERE id = ?', [invoiceOut.id], {userId});
+ await Self.rawSql('UPDATE invoiceOut SET hasPdf = true WHERE id = ?', [invoiceOut.id], {userId});
- if (isToBeMailed) {
- const invoiceAttachment = {
- filename: fileName,
- content: stream
- };
+ if (isToBeMailed) {
+ const invoiceAttachment = {
+ filename: fileName,
+ content: stream
+ };
- if (invoiceOut.serial == 'E' && invoiceOut.companyCode == 'VNL') {
- const exportation = new Report('exportation', args);
- const stream = await exportation.toPdfStream();
- const fileName = `CITES-${invoiceOut.ref}.pdf`;
+ if (invoiceOut.serial == 'E' && invoiceOut.companyCode == 'VNL') {
+ const exportation = new Report('exportation', args);
+ const stream = await exportation.toPdfStream();
+ const fileName = `CITES-${invoiceOut.ref}.pdf`;
- mailOptions.attachments.push({
- filename: fileName,
- content: stream
- });
- }
+ mailOptions.attachments.push({
+ filename: fileName,
+ content: stream
+ });
+ }
- mailOptions.attachments.push(invoiceAttachment);
+ mailOptions.attachments.push(invoiceAttachment);
- const email = new Email('invoice', args);
- await email.send(mailOptions);
- }
- } else if (isToBeMailed) {
- const args = {
- id: ticket.id,
- recipientId: ticket.clientFk,
- recipient: ticket.recipient,
- replyTo: ticket.salesPersonEmail
- };
+ const email = new Email('invoice', args);
+ await email.send(mailOptions);
+ }
+ } else if (isToBeMailed) {
+ const args = {
+ id: ticket.id,
+ recipientId: ticket.clientFk,
+ recipient: ticket.recipient,
+ replyTo: ticket.salesPersonEmail
+ };
- const email = new Email('delivery-note-link', args);
- await email.send();
- }
+ const email = new Email('delivery-note-link', args);
+ await email.send();
+ }
- // Incoterms authorization
- const [{firstOrder}] = await Self.rawSql(`
- SELECT COUNT(*) as firstOrder
- FROM ticket t
- JOIN client c ON c.id = t.clientFk
- WHERE t.clientFk = ?
- AND NOT t.isDeleted
- AND c.isVies
- `, [ticket.clientFk]);
+ // Incoterms authorization
+ const [{firstOrder}] = await Self.rawSql(`
+ SELECT COUNT(*) as firstOrder
+ FROM ticket t
+ JOIN client c ON c.id = t.clientFk
+ WHERE t.clientFk = ?
+ AND NOT t.isDeleted
+ AND c.isVies
+ `, [ticket.clientFk]);
- if (firstOrder == 1) {
- const args = {
- id: ticket.clientFk,
- companyId: ticket.companyFk,
- recipientId: ticket.clientFk,
- recipient: ticket.recipient,
- replyTo: ticket.salesPersonEmail
- };
+ if (firstOrder == 1) {
+ const args = {
+ id: ticket.clientFk,
+ companyId: ticket.companyFk,
+ recipientId: ticket.clientFk,
+ recipient: ticket.recipient,
+ replyTo: ticket.salesPersonEmail
+ };
- const email = new Email('incoterms-authorization', args);
- await email.send();
+ const email = new Email('incoterms-authorization', args);
+ await email.send();
- const [sample] = await Self.rawSql(
- `SELECT id
- FROM sample
- WHERE code = 'incoterms-authorization'
- `);
+ const [sample] = await Self.rawSql(
+ `SELECT id
+ FROM sample
+ WHERE code = 'incoterms-authorization'
+ `);
- await Self.rawSql(`
- INSERT INTO clientSample (clientFk, typeFk, companyFk) VALUES(?, ?, ?)
- `, [ticket.clientFk, sample.id, ticket.companyFk], {userId});
- }
- } catch (error) {
- // Domain not found
- if (error.responseCode == 450)
- return invalidEmail(ticket);
+ await Self.rawSql(`
+ INSERT INTO clientSample (clientFk, typeFk, companyFk) VALUES(?, ?, ?)
+ `, [ticket.clientFk, sample.id, ticket.companyFk], {userId});
+ };
+ } catch (error) {
+ // Domain not found
+ if (error.responseCode == 450)
+ return invalidEmail(ticket);
- // Save tickets on a list of failed ids
- failedtickets.push({
- id: ticket.id,
- stacktrace: error
- });
- }
- }
+ // Save tickets on a list of failed ids
+ failedtickets.push({
+ id: ticket.id,
+ stacktrace: error
+ });
+ }
+ }
- // Send email with failed tickets
- if (failedtickets.length > 0) {
- let body = 'This following tickets have failed:
';
+ // Send email with failed tickets
+ if (failedtickets.length > 0) {
+ let body = 'This following tickets have failed:
';
- for (const ticket of failedtickets) {
- body += `Ticket: ${ticket.id}
-
${ticket.stacktrace}
`;
- }
+ for (const ticket of failedtickets) {
+ body += `Ticket: ${ticket.id}
+
${ticket.stacktrace}
`;
+ }
- smtp.send({
- to: config.app.reportEmail,
- subject: '[API] Nightly ticket closure report',
- html: body
- });
- }
+ smtp.send({
+ to: config.app.reportEmail,
+ subject: '[API] Nightly ticket closure report',
+ html: body
+ });
+ }
- async function invalidEmail(ticket) {
- await Self.rawSql(`UPDATE client SET email = NULL WHERE id = ?`, [
- ticket.clientFk
- ], {userId});
+ async function invalidEmail(ticket) {
+ await Self.rawSql(`UPDATE client SET email = NULL WHERE id = ?`, [
+ ticket.clientFk
+ ], {userId});
- const oldInstance = `{"email": "${ticket.recipient}"}`;
- const newInstance = `{"email": ""}`;
- await Self.rawSql(`
- INSERT INTO clientLog (originFk, userFk, action, changedModel, oldInstance, newInstance)
- VALUES (?, NULL, 'UPDATE', 'Client', ?, ?)`, [
- ticket.clientFk,
- oldInstance,
- newInstance
- ], {userId});
+ const oldInstance = `{"email": "${ticket.recipient}"}`;
+ const newInstance = `{"email": ""}`;
+ await Self.rawSql(`
+ INSERT INTO clientLog (originFk, userFk, action, changedModel, oldInstance, newInstance)
+ VALUES (?, NULL, 'UPDATE', 'Client', ?, ?)`, [
+ ticket.clientFk,
+ oldInstance,
+ newInstance
+ ], {userId});
- const body = `No se ha podido enviar el albarán ${ticket.id}
- al cliente ${ticket.clientFk} - ${ticket.clientName}
- porque la dirección de email "${ticket.recipient}" no es correcta
- o no está disponible.
- Para evitar que se repita este error, se ha eliminado la dirección de email de la ficha del cliente.
- Actualiza la dirección de email con una correcta.`;
+ const body = `No se ha podido enviar el albarán ${ticket.id}
+ al cliente ${ticket.clientFk} - ${ticket.clientName}
+ porque la dirección de email "${ticket.recipient}" no es correcta
+ o no está disponible.
+ Para evitar que se repita este error, se ha eliminado la dirección de email de la ficha del cliente.
+ Actualiza la dirección de email con una correcta.`;
- smtp.send({
- to: ticket.salesPersonEmail,
- subject: 'No se ha podido enviar el albarán',
- html: body
- });
- }
+ smtp.send({
+ to: ticket.salesPersonEmail,
+ subject: 'No se ha podido enviar el albarán',
+ html: body
+ });
+ }
};
diff --git a/modules/ticket/back/methods/ticket/componentUpdate.js b/modules/ticket/back/methods/ticket/componentUpdate.js
index 48aee36d4f..8aad8959bb 100644
--- a/modules/ticket/back/methods/ticket/componentUpdate.js
+++ b/modules/ticket/back/methods/ticket/componentUpdate.js
@@ -1,5 +1,5 @@
-const UserError = require('vn-loopback/util/user-error');
const loggable = require('vn-loopback/util/log');
+const UserError = require('vn-loopback/util/user-error');
module.exports = Self => {
Self.remoteMethodCtx('componentUpdate', {
@@ -113,13 +113,9 @@ module.exports = Self => {
}
try {
- const userId = ctx.req.accessToken.userId;
const models = Self.app.models;
const $t = ctx.req.__; // $translate
- const isEditable = await models.Ticket.isEditable(ctx, args.id, myOptions);
-
- if (!isEditable)
- throw new UserError(`The sales of this ticket can't be modified`);
+ await models.Ticket.isEditableOrThrow(ctx, args.id, myOptions);
const editZone = await models.ACL.checkAccessAcl(ctx, 'Ticket', 'editZone', 'WRITE');
if (!editZone) {
@@ -131,11 +127,8 @@ module.exports = Self => {
args.warehouseFk,
myOptions);
- if (!zoneShipped || zoneShipped.zoneFk != args.zoneFk) {
- const error = `You don't have privileges to change the zone`;
-
- throw new UserError(error);
- }
+ if (!zoneShipped || zoneShipped.zoneFk != args.zoneFk)
+ throw new UserError(`You don't have privileges to change the zone`);
}
if (args.isWithoutNegatives) {
diff --git a/modules/ticket/back/methods/ticket/docuwareDownload.js b/modules/ticket/back/methods/ticket/docuwareDownload.js
index e9b74b1a96..7084bbdd4b 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/filter.js b/modules/ticket/back/methods/ticket/filter.js
index 262b3fd743..eb3da39aff 100644
--- a/modules/ticket/back/methods/ticket/filter.js
+++ b/modules/ticket/back/methods/ticket/filter.js
@@ -248,6 +248,7 @@ module.exports = Self => {
am.name AS agencyMode,
am.id AS agencyModeFk,
st.name AS state,
+ st.classColor,
wk.lastName AS salesPerson,
ts.stateFk AS stateFk,
ts.alertLevel AS alertLevel,
@@ -339,7 +340,8 @@ module.exports = Self => {
{'tp.isFreezed': hasProblem},
{'tp.risk': hasProblem},
{'tp.hasTicketRequest': hasProblem},
- {'tp.itemShortage': range}
+ {'tp.itemShortage': range},
+ {'tp.hasRounding': hasProblem}
]};
if (hasWhere)
diff --git a/modules/ticket/back/methods/ticket/getTicketsFuture.js b/modules/ticket/back/methods/ticket/getTicketsFuture.js
index 901e546f75..fa24cc379d 100644
--- a/modules/ticket/back/methods/ticket/getTicketsFuture.js
+++ b/modules/ticket/back/methods/ticket/getTicketsFuture.js
@@ -194,7 +194,8 @@ module.exports = Self => {
{'tp.hasTicketRequest': hasProblem},
{'tp.itemShortage': range},
{'tp.hasComponentLack': hasProblem},
- {'tp.isTooLittle': hasProblem}
+ {'tp.isTooLittle': hasProblem},
+ {'tp.hasRounding': hasProblem}
]
};
diff --git a/modules/ticket/back/methods/ticket/isEditable.js b/modules/ticket/back/methods/ticket/isEditable.js
index 13bd4d57fc..f657cd5e3c 100644
--- a/modules/ticket/back/methods/ticket/isEditable.js
+++ b/modules/ticket/back/methods/ticket/isEditable.js
@@ -20,41 +20,12 @@ module.exports = Self => {
});
Self.isEditable = async(ctx, id, options) => {
- const models = Self.app.models;
- const myOptions = {};
-
- if (typeof options == 'object')
- Object.assign(myOptions, options);
-
- const state = await models.TicketState.findOne({
- where: {ticketFk: id}
- }, myOptions);
-
- const isRoleAdvanced = await models.ACL.checkAccessAcl(ctx, 'Ticket', 'isRoleAdvanced', '*');
-
- const alertLevel = state ? state.alertLevel : null;
- const ticket = await models.Ticket.findById(id, {
- fields: ['clientFk'],
- include: [{
- relation: 'client',
- scope: {
- include: {
- relation: 'type'
- }
- }
- }]
- }, myOptions);
-
- const isLocked = await models.Ticket.isLocked(id, myOptions);
- const isWeekly = await models.TicketWeekly.findOne({where: {ticketFk: id}}, myOptions);
-
- const alertLevelGreaterThanZero = (alertLevel && alertLevel > 0);
- const isNormalClient = ticket && ticket.client().type().code == 'normal';
- const isEditable = !(alertLevelGreaterThanZero && isNormalClient);
-
- if (ticket && (isEditable || isRoleAdvanced) && !isLocked && !isWeekly)
- return true;
-
- return false;
+ try {
+ await Self.isEditableOrThrow(ctx, id, options);
+ } catch (e) {
+ if (e.name === 'ForbiddenError') return false;
+ throw e;
+ }
+ return true;
};
};
diff --git a/modules/ticket/back/methods/ticket/isEditableOrThrow.js b/modules/ticket/back/methods/ticket/isEditableOrThrow.js
new file mode 100644
index 0000000000..6a8bafa2cb
--- /dev/null
+++ b/modules/ticket/back/methods/ticket/isEditableOrThrow.js
@@ -0,0 +1,49 @@
+const ForbiddenError = require('vn-loopback/util/forbiddenError');
+
+module.exports = Self => {
+ Self.isEditableOrThrow = async(ctx, id, options) => {
+ const models = Self.app.models;
+ const myOptions = {};
+
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
+
+ const state = await models.TicketState.findOne({
+ where: {ticketFk: id}
+ }, myOptions);
+
+ const isRoleAdvanced = await models.ACL.checkAccessAcl(ctx, 'Ticket', 'isRoleAdvanced', '*');
+ 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',
+ scope: {
+ include: {
+ relation: 'type'
+ }
+ }
+ }]
+ }, myOptions);
+
+ const isLocked = await models.Ticket.isLocked(id, myOptions);
+ const isWeekly = await models.TicketWeekly.findOne({where: {ticketFk: id}}, myOptions);
+
+ const alertLevelGreaterThanZero = (alertLevel && alertLevel > 0);
+ const isNormalClient = ticket && ticket.client().type().code == 'normal';
+ const isEditable = !(alertLevelGreaterThanZero && isNormalClient);
+
+ if (!ticket)
+ throw new ForbiddenError(`The ticket doesn't exist.`);
+
+ if (!isEditable && !isRoleAdvanced)
+ throw new ForbiddenError(`This ticket is not editable.`);
+
+ if (isLocked)
+ throw new ForbiddenError(`This ticket is locked.`);
+
+ if (isWeekly && !canEditWeeklyTicket)
+ throw new ForbiddenError(`You don't have enough privileges.`);
+ };
+};
diff --git a/modules/ticket/back/methods/ticket/priceDifference.js b/modules/ticket/back/methods/ticket/priceDifference.js
index 42a71f1c8c..7dc85bd3dd 100644
--- a/modules/ticket/back/methods/ticket/priceDifference.js
+++ b/modules/ticket/back/methods/ticket/priceDifference.js
@@ -72,10 +72,7 @@ module.exports = Self => {
}
try {
- const isEditable = await Self.isEditable(ctx, args.id, myOptions);
-
- if (!isEditable)
- throw new UserError(`The sales of this ticket can't be modified`);
+ await Self.isEditableOrThrow(ctx, args.id, myOptions);
const editZone = await models.ACL.checkAccessAcl(ctx, 'Ticket', 'editZone', 'WRITE');
if (!editZone) {
diff --git a/modules/ticket/back/methods/ticket/recalculateComponents.js b/modules/ticket/back/methods/ticket/recalculateComponents.js
index eb9c8a72ed..bdf74f8b63 100644
--- a/modules/ticket/back/methods/ticket/recalculateComponents.js
+++ b/modules/ticket/back/methods/ticket/recalculateComponents.js
@@ -1,4 +1,3 @@
-const UserError = require('vn-loopback/util/user-error');
module.exports = Self => {
Self.remoteMethodCtx('recalculateComponents', {
description: 'Calculates the price of a sale and its components',
@@ -33,10 +32,7 @@ module.exports = Self => {
}
try {
- const isEditable = await Self.isEditable(ctx, id, myOptions);
-
- if (!isEditable)
- throw new UserError(`The current ticket can't be modified`);
+ await Self.isEditableOrThrow(ctx, id, myOptions);
const recalculation = await Self.rawSql('CALL vn.ticket_recalcComponents(?, NULL)', [id], myOptions);
diff --git a/modules/ticket/back/methods/ticket/setDeleted.js b/modules/ticket/back/methods/ticket/setDeleted.js
index 878cce0561..2f8c402da0 100644
--- a/modules/ticket/back/methods/ticket/setDeleted.js
+++ b/modules/ticket/back/methods/ticket/setDeleted.js
@@ -39,10 +39,7 @@ module.exports = Self => {
const ticketToDelete = await models.Ticket.findById(id, {fields: ['isDeleted']}, myOptions);
if (ticketToDelete.isDeleted) return false;
- const isEditable = await Self.isEditable(ctx, id, myOptions);
-
- if (!isEditable)
- throw new UserError(`The sales of this ticket can't be modified`);
+ await Self.isEditableOrThrow(ctx, id, myOptions);
// Check if ticket has refunds
const ticketRefunds = await models.TicketRefund.find({
diff --git a/modules/ticket/back/methods/ticket/specs/addSale.spec.js b/modules/ticket/back/methods/ticket/specs/addSale.spec.js
index 2e568716ac..b1ecb133b0 100644
--- a/modules/ticket/back/methods/ticket/specs/addSale.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/addSale.spec.js
@@ -97,6 +97,6 @@ describe('ticket addSale()', () => {
error = e;
}
- expect(error.message).toEqual(`The sales of this ticket can't be modified`);
+ expect(error.message).toEqual(`This ticket is locked.`);
});
});
diff --git a/modules/ticket/back/methods/ticket/specs/isEditable.spec.js b/modules/ticket/back/methods/ticket/specs/isEditable.spec.js
index 7337017d6a..301745ed34 100644
--- a/modules/ticket/back/methods/ticket/specs/isEditable.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/isEditable.spec.js
@@ -1,156 +1,37 @@
const models = require('vn-loopback/server/server').models;
-describe('ticket isEditable()', () => {
- it('should return false if the given ticket does not exist', async() => {
+describe('isEditable()', () => {
+ it('should return false if It is able to edit', async() => {
const tx = await models.Ticket.beginTransaction({});
let result;
try {
const options = {transaction: tx};
- const ctx = {
- req: {accessToken: {userId: 9}}
- };
-
- result = await models.Ticket.isEditable(ctx, 9999, options);
-
+ const ctx = {req: {accessToken: {userId: 35}}};
+ result = await models.Ticket.isEditable(ctx, 5, options);
await tx.rollback();
- } catch (e) {
+ } catch (error) {
await tx.rollback();
throw e;
}
- expect(result).toEqual(false);
+ expect(result).toBeFalse();
});
- it(`should return false if the given ticket isn't invoiced but isDeleted`, async() => {
+ it('should return true if It is able to edit', async() => {
const tx = await models.Ticket.beginTransaction({});
let result;
try {
const options = {transaction: tx};
- const deletedTicket = await models.Ticket.findOne({
- where: {
- invoiceOut: null,
- isDeleted: true
- },
- fields: ['id']
- });
-
- const ctx = {
- req: {accessToken: {userId: 9}}
- };
-
- result = await models.Ticket.isEditable(ctx, deletedTicket.id, options);
-
+ const ctx = {req: {accessToken: {userId: 35}}};
+ result = await models.Ticket.isEditable(ctx, 15, options);
await tx.rollback();
- } catch (e) {
+ } catch (error) {
await tx.rollback();
throw e;
}
- expect(result).toEqual(false);
- });
-
- it('should return true if the given ticket is editable', async() => {
- const tx = await models.Ticket.beginTransaction({});
- let result;
-
- try {
- const options = {transaction: tx};
- const ctx = {
- req: {accessToken: {userId: 9}}
- };
-
- result = await models.Ticket.isEditable(ctx, 16, options);
-
- await tx.rollback();
- } catch (e) {
- await tx.rollback();
- throw e;
- }
-
- expect(result).toEqual(true);
- });
-
- it('should not be able to edit a deleted or invoiced ticket even for salesAssistant', async() => {
- const tx = await models.Ticket.beginTransaction({});
- let result;
-
- try {
- const options = {transaction: tx};
- const ctx = {
- req: {accessToken: {userId: 21}}
- };
-
- result = await models.Ticket.isEditable(ctx, 19, options);
-
- await tx.rollback();
- } catch (e) {
- await tx.rollback();
- throw e;
- }
-
- expect(result).toEqual(false);
- });
-
- it('should not be able to edit a deleted or invoiced ticket even for productionBoss', async() => {
- const tx = await models.Ticket.beginTransaction({});
- let result;
-
- try {
- const options = {transaction: tx};
- const ctx = {
- req: {accessToken: {userId: 50}}
- };
-
- result = await models.Ticket.isEditable(ctx, 19, options);
-
- await tx.rollback();
- } catch (e) {
- await tx.rollback();
- throw e;
- }
-
- expect(result).toEqual(false);
- });
-
- it('should not be able to edit a deleted or invoiced ticket even for salesPerson', async() => {
- const tx = await models.Ticket.beginTransaction({});
- let result;
-
- try {
- const options = {transaction: tx};
- const ctx = {
- req: {accessToken: {userId: 18}}
- };
-
- result = await models.Ticket.isEditable(ctx, 19, options);
-
- await tx.rollback();
- } catch (e) {
- await tx.rollback();
- throw e;
- }
-
- expect(result).toEqual(false);
- });
-
- it('should not be able to edit if is a ticket weekly', async() => {
- const tx = await models.Ticket.beginTransaction({});
-
- try {
- const options = {transaction: tx};
-
- const ctx = {req: {accessToken: {userId: 1}}};
-
- const result = await models.Ticket.isEditable(ctx, 15, options);
-
- expect(result).toEqual(false);
-
- await tx.rollback();
- } catch (e) {
- await tx.rollback();
- throw e;
- }
+ expect(result).toBeTrue();
});
});
diff --git a/modules/ticket/back/methods/ticket/specs/isEditableOrThrow.spec.js b/modules/ticket/back/methods/ticket/specs/isEditableOrThrow.spec.js
new file mode 100644
index 0000000000..6c89bac268
--- /dev/null
+++ b/modules/ticket/back/methods/ticket/specs/isEditableOrThrow.spec.js
@@ -0,0 +1,96 @@
+const models = require('vn-loopback/server/server').models;
+
+describe('ticket isEditableOrThrow()', () => {
+ it('should throw an error as the ticket does not exist', async() => {
+ const tx = await models.Ticket.beginTransaction({});
+ let error;
+ try {
+ const options = {transaction: tx};
+ const ctx = {
+ req: {accessToken: {userId: 9}}
+ };
+
+ await models.Ticket.isEditableOrThrow(ctx, 9999, options);
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ error = e;
+ }
+
+ expect(error.message).toEqual(`The ticket doesn't exist.`);
+ });
+
+ it('should throw an error as this ticket is not editable', async() => {
+ const tx = await models.Ticket.beginTransaction({});
+ let error;
+
+ try {
+ const options = {transaction: tx};
+ const ctx = {
+ req: {accessToken: {userId: 1}}
+ };
+
+ await models.Ticket.isEditableOrThrow(ctx, 8, options);
+ await tx.rollback();
+ } catch (e) {
+ error = e;
+ await tx.rollback();
+ }
+
+ expect(error.message).toEqual(`This ticket is not editable.`);
+ });
+
+ it('should throw an error as this ticket is locked.', async() => {
+ const tx = await models.Ticket.beginTransaction({});
+ let error;
+ try {
+ const options = {transaction: tx};
+ const ctx = {
+ req: {accessToken: {userId: 18}}
+ };
+
+ await models.Ticket.isEditableOrThrow(ctx, 19, options);
+
+ await tx.rollback();
+ } catch (e) {
+ error = e;
+ await tx.rollback();
+ }
+
+ expect(error.message).toEqual(`This ticket is locked.`);
+ });
+
+ it('should throw an error as you do not have enough privileges.', async() => {
+ const tx = await models.Ticket.beginTransaction({});
+ let error;
+ try {
+ const options = {transaction: tx};
+ const ctx = {req: {accessToken: {userId: 1}}};
+
+ await models.Ticket.isEditableOrThrow(ctx, 15, options);
+ await tx.rollback();
+ } catch (e) {
+ error = e;
+ await tx.rollback();
+ }
+
+ expect(error.message).toEqual(`You don't have enough privileges.`);
+ });
+
+ it('should return undefined if It can be edited', async() => {
+ const tx = await models.Ticket.beginTransaction({});
+ let result;
+ try {
+ const options = {transaction: tx};
+ const ctx = {req: {accessToken: {userId: 35}}};
+
+ result = await models.Ticket.isEditableOrThrow(ctx, 15, options);
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+
+ expect(result).toBeUndefined();
+ });
+});
diff --git a/modules/ticket/back/methods/ticket/specs/priceDifference.spec.js b/modules/ticket/back/methods/ticket/specs/priceDifference.spec.js
index cc54353ef5..d01f0c1bba 100644
--- a/modules/ticket/back/methods/ticket/specs/priceDifference.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/priceDifference.spec.js
@@ -1,5 +1,6 @@
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()', () => {
it('should return ticket price differences', async() => {
@@ -59,7 +60,7 @@ describe('sale priceDifference()', () => {
await tx.rollback();
}
- expect(error).toEqual(new UserError(`The sales of this ticket can't be modified`));
+ expect(error).toEqual(new ForbiddenError(`This ticket is not editable.`));
});
it('should return ticket movable', async() => {
diff --git a/modules/ticket/back/methods/ticket/specs/recalculateComponents.spec.js b/modules/ticket/back/methods/ticket/specs/recalculateComponents.spec.js
index ed10d114f4..383c2c6d51 100644
--- a/modules/ticket/back/methods/ticket/specs/recalculateComponents.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/recalculateComponents.spec.js
@@ -1,4 +1,5 @@
const models = require('vn-loopback/server/server').models;
+const ForbiddenError = require('vn-loopback/util/forbiddenError');
describe('ticket recalculateComponents()', () => {
const ticketId = 11;
@@ -38,6 +39,6 @@ describe('ticket recalculateComponents()', () => {
error = e;
}
- expect(error).toEqual(new Error(`The current ticket can't be modified`));
+ expect(error).toEqual(new ForbiddenError(`This ticket is locked.`));
});
});
diff --git a/modules/ticket/back/methods/ticket/specs/transferClient.spec.js b/modules/ticket/back/methods/ticket/specs/transferClient.spec.js
index ed10e5159a..c09c20083d 100644
--- a/modules/ticket/back/methods/ticket/specs/transferClient.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/transferClient.spec.js
@@ -23,7 +23,7 @@ describe('Ticket transferClient()', () => {
error = e;
}
- expect(error.message).toEqual(`The current ticket can't be modified`);
+ expect(error.message).toEqual(`This ticket is locked.`);
});
it('should be assigned a different clientFk', async() => {
diff --git a/modules/ticket/back/methods/ticket/specs/transferSales.spec.js b/modules/ticket/back/methods/ticket/specs/transferSales.spec.js
index 5626889178..69829fe668 100644
--- a/modules/ticket/back/methods/ticket/specs/transferSales.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/transferSales.spec.js
@@ -5,6 +5,8 @@ describe('sale transferSales()', () => {
const userId = 1101;
const activeCtx = {
accessToken: {userId: userId},
+ headers: {origin: ''},
+ __: value => value
};
const ctx = {req: activeCtx};
@@ -33,7 +35,7 @@ describe('sale transferSales()', () => {
error = e;
}
- expect(error.message).toEqual(`The sales of this ticket can't be modified`);
+ expect(error.message).toEqual(`This ticket is not editable.`);
});
it('should throw an error if the receiving ticket is not editable', async() => {
diff --git a/modules/ticket/back/methods/ticket/transferClient.js b/modules/ticket/back/methods/ticket/transferClient.js
index 04c153bd2e..60e70d7107 100644
--- a/modules/ticket/back/methods/ticket/transferClient.js
+++ b/modules/ticket/back/methods/ticket/transferClient.js
@@ -1,4 +1,3 @@
-const UserError = require('vn-loopback/util/user-error');
module.exports = Self => {
Self.remoteMethodCtx('transferClient', {
description: 'Transfering ticket to another client',
@@ -29,10 +28,7 @@ module.exports = Self => {
if (typeof options == 'object')
Object.assign(myOptions, options);
- const isEditable = await Self.isEditable(ctx, id, myOptions);
-
- if (!isEditable)
- throw new UserError(`The current ticket can't be modified`);
+ await Self.isEditableOrThrow(ctx, id, myOptions);
const ticket = await models.Ticket.findById(
id,
diff --git a/modules/ticket/back/methods/ticket/transferSales.js b/modules/ticket/back/methods/ticket/transferSales.js
index 0eee50d5fc..1124f7ec70 100644
--- a/modules/ticket/back/methods/ticket/transferSales.js
+++ b/modules/ticket/back/methods/ticket/transferSales.js
@@ -1,4 +1,4 @@
-let UserError = require('vn-loopback/util/user-error');
+const UserError = require('vn-loopback/util/user-error');
module.exports = Self => {
Self.remoteMethodCtx('transferSales', {
@@ -37,6 +37,7 @@ module.exports = Self => {
const userId = ctx.req.accessToken.userId;
const models = Self.app.models;
const myOptions = {userId};
+ const $t = ctx.req.__; // $translate
let tx;
if (typeof options == 'object')
@@ -48,9 +49,7 @@ module.exports = Self => {
}
try {
- const isEditable = await models.Ticket.isEditable(ctx, id, myOptions);
- if (!isEditable)
- throw new UserError(`The sales of this ticket can't be modified`);
+ await models.Ticket.isEditableOrThrow(ctx, id, myOptions);
if (ticketId) {
const isReceiverEditable = await models.Ticket.isEditable(ctx, ticketId, myOptions);
@@ -97,9 +96,18 @@ module.exports = Self => {
const isTicketEmpty = await models.Ticket.isEmpty(id, myOptions);
if (isTicketEmpty) {
- await originalTicket.updateAttributes({
- isDeleted: true
- }, myOptions);
+ try {
+ await models.Ticket.setDeleted(ctx, id, myOptions);
+ } catch (e) {
+ if (e.statusCode === 400) {
+ throw new UserError(
+ `This ticket cannot be left empty.`,
+ 'TRANSFER_SET_DELETED',
+ $t(e.message, ...e.translateArgs)
+ );
+ }
+ throw e;
+ }
}
if (tx) await tx.commit();
diff --git a/modules/ticket/back/model-config.json b/modules/ticket/back/model-config.json
index 3c7e12eead..83d7303b73 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 0000000000..70207568bc
--- /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 af76af718a..496dd88d32 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 4a46dd6b7b..54a2b5a1af 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 bab201fddb..ae247fc242 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/state.json b/modules/ticket/back/models/state.json
index 9d4dd4f5d6..8b7eb69c69 100644
--- a/modules/ticket/back/models/state.json
+++ b/modules/ticket/back/models/state.json
@@ -27,6 +27,9 @@
"code": {
"type": "string",
"required": false
+ },
+ "classColor": {
+ "type": "string"
}
}
}
diff --git a/modules/ticket/back/models/ticket-methods.js b/modules/ticket/back/models/ticket-methods.js
index b432c9f6bb..14cb104be5 100644
--- a/modules/ticket/back/models/ticket-methods.js
+++ b/modules/ticket/back/models/ticket-methods.js
@@ -6,6 +6,7 @@ module.exports = function(Self) {
require('../methods/ticket/componentUpdate')(Self);
require('../methods/ticket/new')(Self);
require('../methods/ticket/isEditable')(Self);
+ require('../methods/ticket/isEditableOrThrow')(Self);
require('../methods/ticket/setDeleted')(Self);
require('../methods/ticket/restore')(Self);
require('../methods/ticket/getSales')(Self);
@@ -41,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 360d935644..d1f39fd19f 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/future/index.html b/modules/ticket/front/future/index.html
index 78b0f98645..5119d103b5 100644
--- a/modules/ticket/front/future/index.html
+++ b/modules/ticket/front/future/index.html
@@ -123,6 +123,12 @@
class="bright"
icon="icon-components">
+
+
+
+
{{::ticket.id}}
diff --git a/modules/ticket/front/routes.json b/modules/ticket/front/routes.json
index c86b3a1efc..e403ab02dc 100644
--- a/modules/ticket/front/routes.json
+++ b/modules/ticket/front/routes.json
@@ -26,7 +26,8 @@
{"state": "ticket.card.components", "icon": "icon-components"},
{"state": "ticket.card.saleTracking", "icon": "assignment"},
{"state": "ticket.card.dms.index", "icon": "cloud_download"},
- {"state": "ticket.card.boxing", "icon": "science"}
+ {"state": "ticket.card.boxing", "icon": "science"},
+ {"state": "ticket.card.sms", "icon": "sms"}
]
},
"keybindings": [
@@ -287,6 +288,15 @@
"state": "ticket.advance",
"component": "vn-ticket-advance",
"description": "Advance tickets"
+ },
+ {
+ "url": "/sms",
+ "state": "ticket.card.sms",
+ "component": "vn-ticket-sms",
+ "description": "Sms",
+ "params": {
+ "ticket": "$ctrl.ticket"
+ }
}
]
}
diff --git a/modules/ticket/front/sale-tracking/index.html b/modules/ticket/front/sale-tracking/index.html
index 0309dde130..f05cf15fbd 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 60b422cc01..6c0e7232ea 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: '
diff --git a/modules/ticket/front/sms/index.js b/modules/ticket/front/sms/index.js
new file mode 100644
index 0000000000..69d54aafe8
--- /dev/null
+++ b/modules/ticket/front/sms/index.js
@@ -0,0 +1,21 @@
+import ngModule from '../module';
+import Section from 'salix/components/section';
+
+class Controller extends Section {
+ constructor($element, $) {
+ super($element, $);
+ }
+
+ async $onInit() {
+ this.$state.go('ticket.card.summary', {id: this.$params.id});
+ window.location.href = await this.vnApp.getUrl(`ticket/${this.$params.id}/sms`);
+ }
+}
+
+ngModule.vnComponent('vnTicketSms', {
+ template: require('./index.html'),
+ controller: Controller,
+ bindings: {
+ ticket: '<'
+ }
+});
diff --git a/modules/ticket/front/tracking/edit/index.html b/modules/ticket/front/tracking/edit/index.html
index c522536b3e..bff8e71b12 100644
--- a/modules/ticket/front/tracking/edit/index.html
+++ b/modules/ticket/front/tracking/edit/index.html
@@ -14,22 +14,15 @@
-
-
+ ng-model="$ctrl.workerFk">
+
@@ -43,4 +36,4 @@
ui-sref="ticket.card.tracking.index">
-
\ No newline at end of file
+
diff --git a/modules/worker/back/methods/worker-dms/filter.js b/modules/worker/back/methods/worker-dms/filter.js
index 5f55f1bd71..9d85544848 100644
--- a/modules/worker/back/methods/worker-dms/filter.js
+++ b/modules/worker/back/methods/worker-dms/filter.js
@@ -71,8 +71,9 @@ module.exports = Self => {
'Stored on': 'created',
'Document ID': 'id'
};
+
workerDocuware =
- await models.Docuware.getById('hr', worker.lastName + worker.firstName, docuwareParse) ?? [];
+ await models.Docuware.getById('hr', worker.lastName + ' ' + worker.firstName, docuwareParse) ?? [];
for (document of workerDocuware) {
const defaultData = {
file: 'dw' + document.id + '.png',
diff --git a/modules/worker/back/methods/worker-time-control/filter.js b/modules/worker/back/methods/worker-time-control/filter.js
index 041c6cbfbd..6d08802536 100644
--- a/modules/worker/back/methods/worker-time-control/filter.js
+++ b/modules/worker/back/methods/worker-time-control/filter.js
@@ -36,9 +36,9 @@ module.exports = Self => {
if (isSubordinate === false)
throw new UserError(`You don't have enough privileges`);
- const subordinate = await Worker.findById(ctx.args.workerFk);
+ const subordinate = await Worker.findById(ctx.args.workerFk, {fields: ['id']});
filter = mergeFilters(filter, {where: {
- userFk: subordinate.userFk
+ userFk: subordinate.id
}});
return Self.find(filter);
diff --git a/modules/worker/back/methods/worker-time-control/sendMail.js b/modules/worker/back/methods/worker-time-control/sendMail.js
index ab5e56a77f..66fb7cc23e 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 f440805592..3203dea827 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 9536b0f29b..19038405bd 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',
@@ -24,7 +24,7 @@ module.exports = Self => {
`SELECT DISTINCT w.id, w.firstName, w.lastName, u.name, u.nickname
FROM worker w
JOIN account.user u ON u.id = w.userFk
- JOIN account.roleRole i ON i.role = u.role
+ JOIN account.roleRole i ON i.role = u.role
JOIN account.role r ON r.id = i.inheritsFrom`;
return Self.activeWorkers(query, filter);
diff --git a/modules/worker/back/methods/worker/activeWithRole.js b/modules/worker/back/methods/worker/activeWithRole.js
index 3924164585..c7f96e1511 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 0000000000..cd0a466ea7
--- /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/methods/worker/specs/new.spec.js b/modules/worker/back/methods/worker/specs/new.spec.js
index b2804c2031..d0830b00f6 100644
--- a/modules/worker/back/methods/worker/specs/new.spec.js
+++ b/modules/worker/back/methods/worker/specs/new.spec.js
@@ -20,11 +20,11 @@ describe('Worker new', () => {
const employeeId = 1;
const defaultWorker = {
fi: '78457139E',
- name: 'defaultWorker',
- firstName: 'default',
- lastNames: 'worker',
+ name: 'DEFAULTERWORKER',
+ firstName: 'DEFAULT',
+ lastNames: 'WORKER',
email: 'defaultWorker@mydomain.com',
- street: 'S/ defaultWorkerStreet',
+ street: 'S/ DEFAULTWORKERSTREET',
city: 'defaultWorkerCity',
provinceFk: 1,
companyFk: 442,
diff --git a/modules/worker/back/models/worker.js b/modules/worker/back/models/worker.js
index b44703a88b..ccae3a6e6f 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/back/models/worker.json b/modules/worker/back/models/worker.json
index 6d23c1b665..6e1371055c 100644
--- a/modules/worker/back/models/worker.json
+++ b/modules/worker/back/models/worker.json
@@ -25,8 +25,7 @@
"type" : "string"
},
"userFk": {
- "type" : "number",
- "required": true
+ "type" : "number"
},
"bossFk": {
"type" : "number"
diff --git a/modules/worker/front/basic-data/index.html b/modules/worker/front/basic-data/index.html
index d89d88f2e8..2d85d018de 100644
--- a/modules/worker/front/basic-data/index.html
+++ b/modules/worker/front/basic-data/index.html
@@ -37,14 +37,11 @@
-
-
+
this.worker = res.data),
this.$http.get(`Workers/${this.$params.id}/activeContract`)
- .then(res => this.hasWorkCenter = res.data.workCenterFk)
+ .then(res => this.hasWorkCenter = res.data?.workCenterFk)
]);
}
}
diff --git a/modules/worker/front/create/index.html b/modules/worker/front/create/index.html
index 4817467615..dd3e0b4a90 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/modules/worker/front/department/descriptor/index.js b/modules/worker/front/department/descriptor/index.js
index 5ab1059d91..388a7f776b 100644
--- a/modules/worker/front/department/descriptor/index.js
+++ b/modules/worker/front/department/descriptor/index.js
@@ -32,6 +32,28 @@ class Controller extends Descriptor {
this.vnApp.showSuccess(this.$t('Department deleted.'));
});
}
+
+ loadData() {
+ const filter = {
+ fields: ['id', 'name', 'code', 'workerFk', 'isProduction', 'chatName',
+ 'isTeleworking', 'notificationEmail', 'hasToRefill', 'hasToSendMail', 'hasToMistake', 'clientFk'],
+ include: [
+ {relation: 'client',
+ scope: {
+ fields: ['id', 'name']
+ }},
+ {
+ relation: 'worker',
+ scope: {
+ fields: ['id', 'firstName', 'lastName']
+ }
+ }
+ ]
+ };
+
+ return this.getData(`Departments/${this.id}`, {filter})
+ .then(res => this.entity = res.data);
+ }
}
Controller.$inject = ['$element', '$scope', '$rootScope'];
diff --git a/modules/worker/front/pbx/index.js b/modules/worker/front/pbx/index.js
index d37f6f7d84..3b6443d3c2 100644
--- a/modules/worker/front/pbx/index.js
+++ b/modules/worker/front/pbx/index.js
@@ -5,7 +5,7 @@ class Controller extends Section {
onSubmit() {
const sip = this.worker.sip;
const params = {
- userFk: this.worker.userFk,
+ userFk: this.worker.id,
extension: sip.extension
};
this.$.watcher.check();
diff --git a/modules/worker/front/time-control/index.html b/modules/worker/front/time-control/index.html
index 760b0dafcb..b77acbddcb 100644
--- a/modules/worker/front/time-control/index.html
+++ b/modules/worker/front/time-control/index.html
@@ -4,7 +4,7 @@
filter="::$ctrl.filter"
data="$ctrl.hours">
-
+
@@ -106,12 +106,6 @@
-
- Autonomous worker
-
diff --git a/package-lock.json b/package-lock.json
index 5506075b9d..10b5e6b022 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "salix-back",
- "version": "23.32.01",
+ "version": "23.32.02",
"lockfileVersion": 2,
"requires": true,
"packages": {
diff --git a/package.json b/package.json
index 37e39d5a5c..44a651af4e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "salix-back",
- "version": "23.32.01",
+ "version": "23.38.01",
"author": "Verdnatura Levante SL",
"description": "Salix backend",
"license": "GPL-3.0",
diff --git a/print/templates/email/printer-setup/assets/files/model.ezp b/print/templates/email/printer-setup/assets/files/model.ezpx
similarity index 95%
rename from print/templates/email/printer-setup/assets/files/model.ezp
rename to print/templates/email/printer-setup/assets/files/model.ezpx
index dba98e0ee9..739593447b 100644
--- a/print/templates/email/printer-setup/assets/files/model.ezp
+++ b/print/templates/email/printer-setup/assets/files/model.ezpx
@@ -539,9 +539,9 @@
2
4
-
+
false
- false
+ true
4294967295
5
W5
@@ -571,15 +571,15 @@
2896
- 187
- 24
+ 138
+ 32
426
2896
- 187
- 24
+ 138
+ 32
426
2896
@@ -621,14 +621,14 @@
New label
-Lang:(es-ES) OS:Microsoft Windows NT 10.0.22000.0(Win32NT)
+Lang:(es-ES) OS:Microsoft Windows NT 10.0.19045.0(Win32NT)
Mm
203
EZPL
- GODEX G300#132207AB
- None
+ 00000000
+ COM1
USB
2886794855
9100
diff --git a/print/templates/email/printer-setup/attachments.json b/print/templates/email/printer-setup/attachments.json
index 1e1f710c3b..969fdd23a2 100644
--- a/print/templates/email/printer-setup/attachments.json
+++ b/print/templates/email/printer-setup/attachments.json
@@ -1,9 +1,9 @@
[
{
- "filename": "model.ezp",
+ "filename": "model.ezpx",
"component": "printer-setup",
- "path": "/assets/files/model.ezp",
- "cid": "model.ezp"
+ "path": "/assets/files/model.ezpx",
+ "cid": "model.ezpx"
},
{
"filename": "port.png",
@@ -11,4 +11,4 @@
"path": "/assets/files/port.png",
"cid": "port.png"
}
-]
\ No newline at end of file
+]
diff --git a/print/templates/reports/cmr/assets/css/import.js b/print/templates/reports/cmr/assets/css/import.js
new file mode 100644
index 0000000000..37a98dfddb
--- /dev/null
+++ b/print/templates/reports/cmr/assets/css/import.js
@@ -0,0 +1,12 @@
+const Stylesheet = require(`vn-print/core/stylesheet`);
+
+const path = require('path');
+const vnPrintPath = path.resolve('print');
+
+module.exports = new Stylesheet([
+ `${vnPrintPath}/common/css/spacing.css`,
+ `${vnPrintPath}/common/css/misc.css`,
+ `${vnPrintPath}/common/css/layout.css`,
+ `${vnPrintPath}/common/css/report.css`,
+ `${__dirname}/style.css`])
+ .mergeStyles();
diff --git a/print/templates/reports/cmr/assets/css/style.css b/print/templates/reports/cmr/assets/css/style.css
new file mode 100644
index 0000000000..201afc3b60
--- /dev/null
+++ b/print/templates/reports/cmr/assets/css/style.css
@@ -0,0 +1,101 @@
+html {
+ font-family: "Roboto", "Helvetica", "Arial", sans-serif;
+ margin: 10px;
+ font-size: 22px;
+}
+.mainTable, .specialTable, .categoryTable {
+ width: 100%;
+ border-collapse: collapse;
+ font-size: inherit;
+}
+.mainTable td {
+ width: 50%;
+ border: 1px solid black;
+ vertical-align: top;
+ padding: 15px;
+ font-size: inherit;
+}
+.signTable {
+ height: 12%;
+}
+.signTable td {
+ width: calc(100% / 3);
+ border: 1px solid black;
+ vertical-align: top;
+ font-size: inherit;
+ padding: 15px;
+ border-top: none;
+}
+#title {
+ font-weight: bold;
+ font-size: 85px;
+}
+hr {
+ border: 1px solid #cccccc;
+ height: 0px;
+ border-radius: 25px;
+}
+#cellHeader {
+ border: 0px;
+ text-align: center;
+ vertical-align: middle;
+}
+#label, #merchandiseLabels {
+ font-size: 13px;
+}
+#merchandiseLabels {
+ border: none;
+}
+.imgSection {
+ text-align: center;
+ height: 200px;
+ overflow: hidden;
+}
+img {
+ object-fit: contain;
+ width: 100%;
+ height: 100%;
+}
+#lineBreak {
+ white-space: pre-line;
+}
+.specialTable td {
+ border: 1px solid black;
+ vertical-align: top;
+ padding: 15px;
+ font-size: inherit;
+ border-top: none;
+ border-bottom: none;
+}
+.specialTable #itemCategoryList {
+ width: 70%;
+ padding-top: 10px;
+}
+.categoryTable {
+ padding-bottom: none;
+}
+.categoryTable td {
+ vertical-align: top;
+ font-size: inherit;
+ border: none;
+ padding: 5px;
+ overflow: hidden;
+}
+.categoryTable #merchandiseLabels {
+ border-bottom: 4px solid #cccccc;
+ padding: none;
+}
+#merchandiseDetail {
+ font-weight: bold;
+ padding-top: 10px;
+}
+#merchandiseData {
+ font-weight: bold;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+#merchandiseLabels td {
+ padding-bottom: 11px;
+ max-width: 300px;
+}
\ No newline at end of file
diff --git a/print/templates/reports/cmr/cmr.html b/print/templates/reports/cmr/cmr.html
new file mode 100644
index 0000000000..c6a9e79d6e
--- /dev/null
+++ b/print/templates/reports/cmr/cmr.html
@@ -0,0 +1,212 @@
+
+
+
+
+
+
+
+ 1. Remitente / Expediteur / Sender
+
+ {{data.senderName}}
+ {{data.senderStreet}}
+ {{data.senderPostCode}} {{data.senderCity}} {{(data.senderCountry) ? `(${data.senderCountry})` : null}}
+ |
+
+
+
+
+ 2. Consignatario / Destinataire / Consignee
+
+ {{data.deliveryAddressFk}}
+ {{data.deliveryName}}
+ {{data.deliveryPhone || data.clientPhone}}
+ {{((data.deliveryPhone || data.clientPhone) && data.deliveryMobile) ? '/' : null}}
+ {{data.deliveryMobile}}
+ |
+
+ 16. Transportista / Transporteur / Carrier
+
+ {{data.carrierName}}
+ {{data.carrierStreet}}
+ {{data.carrierPostalCode}} {{data.carrierCity}} {{(data.carrierCountry) ? `(${data.carrierCountry})` : null}}
+ |
+
+
+
+
+ 3. Lugar y fecha de entrega /
+ Lieu et date de livraison /
+ Place and date of delivery
+
+
+ {{data.deliveryStreet}}
+ {{data.deliveryPostalCode}} {{data.deliveryCity}} {{(data.deliveryCountry) ? `(${data.deliveryCountry})` : null}}
+ {{(data.ead) ? formatDate(data.ead, '%d/%m/%Y') : null}}
+
+ |
+
+ 17. Porteadores sucesivos / Transporteurs succesifs / Succesive Carriers
+
+ |
+
+
+
+
+ 4. Lugar y fecha de carga /
+ Lieu et date del prise en charge de la merchandise /
+ Place and date of taking over the goods
+
+
+ {{data.loadStreet}}
+ {{data.loadPostalCode}} {{data.loadCity}} {{(data.loadCountry) ? `(${data.loadCountry})` : null}}
+ {{formatDate(data.created, '%d/%m/%Y')}}
+ |
+
+
+ 18. Obervaciones del transportista /
+ Reserves et observations du transporteur /
+ Carrier's reservations and observations
+
+
+ {{data.truckPlate}}
+ {{data.observations}}
+ |
+
+
+
+ 5. Documentos anexos / Documents annexes / Documents attached
+
+ |
+
+
+
+
+
+
+ 7 & 8. Número de bultos y clase de embalage /
+ Number of packages and packaging class /
+ Nombre de colis et classe d'emballage
+
+
+
+ {{data.packagesList}}
+
+ |
+
+
+
+ | 6. Marcas y números / Brands and numbers / Marques et numéros |
+ 9. Naturaleza de la merc. / Nature of goods / Nature des marchandises |
+ 10. nº Estadístico / Statistical no. / n° statistique |
+ 11. Peso bruto / Gross weight / Poids brut (kg) |
+ 12. Volumen / Volume (m3) |
+
+
+ | {{merchandise.ticketFk}} |
+ {{merchandise.name}} |
+ N/A |
+ {{merchandise.weight}} |
+ {{merchandise.volume}} |
+
+
+
+ {{data.merchandiseDetail}}
+
+ |
+
+
+
+
+
+
+ 13. Instrucciones del remitente /
+ Instrunstions de l'expèditeur / Sender
+ instruccions
+
+
+ {{data.senderInstruccions}}
+ |
+
+
+ 19. Estipulaciones particulares /
+ Conventions particulieres /
+ Special agreements
+
+
+ {{data.specialAgreements}}
+ |
+
+
+
+
+ 14. Forma de pago /
+ Prescriptions d'affranchissement /
+ Instruction as to payment for carriage
+
+
+ {{data.paymentInstruccions}}
+ |
+
+ 20. A pagar por / Être payé pour / To be paid by
+
+ |
+
+
+
+ 21. Formalizado en / Etabile a / Estabilshed in
+
+ {{data.loadStreet}}
+ {{data.loadPostalCode}} {{data.loadCity}} {{(data.loadCountry) ? `(${data.loadCountry})` : null}}
+ |
+
+ 15. Reembolso / Remboursement / Cash on delivery
+
+ |
+
+
+
+
+
+
+
+
+
+ 22. Firma y sello del remitente /
+ Signature et timbre de l'expèditeur /
+ Signature and stamp of the sender
+
+
+
+ ![]()
+ |
+
+
+ 23. Firma y sello del transportista /
+ Signature et timbre du transporteur /
+ Signature and stamp of the carrier
+
+
+
+ ![]()
+ |
+
+
+ 24. Firma y sello del consignatario /
+ Signature et timbre du destinataire /
+ Signature and stamp of the consignee
+
+
+
+ ![]()
+ |
+
+
+
+
+
\ No newline at end of file
diff --git a/print/templates/reports/cmr/cmr.js b/print/templates/reports/cmr/cmr.js
new file mode 100644
index 0000000000..c939e51525
--- /dev/null
+++ b/print/templates/reports/cmr/cmr.js
@@ -0,0 +1,45 @@
+const config = require(`vn-print/core/config`);
+const vnReport = require('../../../core/mixins/vn-report.js');
+const md5 = require('md5');
+const fs = require('fs-extra');
+
+const prefixBase64 = 'data:image/png;base64,';
+
+module.exports = {
+ name: 'cmr',
+ mixins: [vnReport],
+ async serverPrefetch() {
+ this.data = await this.findOneFromDef('data', [this.id]);
+ if (this.data.ticketFk) {
+ this.merchandises = await this.rawSqlFromDef('merchandise', [this.data.ticketFk]);
+ this.signature = await this.findOneFromDef('signature', [this.data.ticketFk]);
+ } else
+ this.merchandises = null;
+
+ this.senderStamp = (this.data.senderStamp)
+ ? `${prefixBase64} ${this.data.senderStamp.toString('base64')}`
+ : null;
+ this.deliveryStamp = (this.data.deliveryStamp)
+ ? `${prefixBase64} ${this.data.deliveryStamp.toString('base64')}`
+ : null;
+ },
+ props: {
+ id: {
+ type: Number,
+ required: true,
+ description: 'The cmr id'
+ },
+ },
+ computed: {
+ signPath() {
+ if (!this.signature) return;
+
+ const signatureName = this.signature.signature
+ const hash = md5(signatureName.toString()).substring(0, 3);
+ const file = `${config.storage.root}/${hash}/${signatureName}.png`;
+ if (!fs.existsSync(file)) return null;
+
+ return `${prefixBase64} ${Buffer.from(fs.readFileSync(file), 'utf8').toString('base64')}`;
+ },
+ }
+};
\ No newline at end of file
diff --git a/print/templates/reports/cmr/locale/es.yml b/print/templates/reports/cmr/locale/es.yml
new file mode 100644
index 0000000000..79f481b352
--- /dev/null
+++ b/print/templates/reports/cmr/locale/es.yml
@@ -0,0 +1 @@
+reportName: cmr
\ No newline at end of file
diff --git a/print/templates/reports/cmr/options.json b/print/templates/reports/cmr/options.json
new file mode 100644
index 0000000000..9151ca63b1
--- /dev/null
+++ b/print/templates/reports/cmr/options.json
@@ -0,0 +1,3 @@
+{
+ "format": "A4"
+}
\ No newline at end of file
diff --git a/print/templates/reports/cmr/sql/data.sql b/print/templates/reports/cmr/sql/data.sql
new file mode 100644
index 0000000000..9708c4483c
--- /dev/null
+++ b/print/templates/reports/cmr/sql/data.sql
@@ -0,0 +1,52 @@
+SELECT c.id cmrFk,
+ t.id ticketFk,
+ c.truckPlate,
+ c.observations,
+ c.senderInstruccions,
+ c.paymentInstruccions,
+ c.specialAgreements,
+ c.created,
+ c.packagesList,
+ c.merchandiseDetail,
+ c.ead,
+ s.name carrierName,
+ s.street carrierStreet,
+ s.postCode carrierPostCode,
+ s.city carrierCity,
+ cou.country carrierCountry,
+ s2.name senderName,
+ s2.street senderStreet,
+ s2.postCode senderPostCode,
+ s2.city senderCity,
+ cou2.country senderCountry,
+ a.street deliveryStreet,
+ a.id deliveryAddressFk,
+ a.postalCode deliveryPostalCode,
+ a.city deliveryCity,
+ a.nickname deliveryName,
+ a.phone deliveryPhone,
+ a.mobile deliveryMobile,
+ cou3.country deliveryCountry,
+ cl.phone clientPhone,
+ a2.street loadStreet,
+ a2.postalCode loadPostalCode,
+ a2.city loadCity,
+ cou4.country loadCountry,
+ co.stamp senderStamp,
+ s.stamp deliveryStamp
+ FROM cmr c
+ LEFT JOIN supplier s ON s.id = c.supplierFk
+ LEFT JOIN country cou ON cou.id = s.countryFk
+ LEFT JOIN company co ON co.id = c.companyFk
+ LEFT JOIN supplierAccount sa ON sa.id = co.supplierAccountFk
+ LEFT JOIN supplier s2 ON s2.id = sa.supplierFk
+ LEFT JOIN country cou2 ON cou2.id = s2.countryFk
+ LEFT JOIN `address` a ON a.id = c.addressToFk
+ LEFT JOIN province p ON p.id = a.provinceFk
+ LEFT JOIN country cou3 ON cou3.id = p.countryFk
+ LEFT JOIN client cl ON cl.id = a.clientFk
+ LEFT JOIN `address` a2 ON a2.id = c.addressFromFk
+ LEFT JOIN province p2 ON p2.id = a2.provinceFk
+ LEFT JOIN country cou4 ON cou4.id = p2.countryFk
+ LEFT JOIN ticket t ON t.cmrFk = c.id
+ WHERE c.id = ?
\ No newline at end of file
diff --git a/print/templates/reports/cmr/sql/merchandise.sql b/print/templates/reports/cmr/sql/merchandise.sql
new file mode 100644
index 0000000000..cab597caa2
--- /dev/null
+++ b/print/templates/reports/cmr/sql/merchandise.sql
@@ -0,0 +1,11 @@
+SELECT s.ticketFk,
+ ic.name,
+ CAST(SUM(sv.weight) AS DECIMAL(10,2)) `weight`,
+ CAST(SUM(sv.volume) AS DECIMAL(10,3)) volume
+ FROM sale s
+ JOIN saleVolume sv ON sv.saleFk = s.id
+ JOIN item i ON i.id = s.itemFk
+ JOIN itemType it ON it.id = i.typeFk
+ JOIN itemCategory ic ON ic.id = it.categoryFk
+ WHERE sv.ticketFk = ?
+ GROUP BY ic.id
\ No newline at end of file
diff --git a/print/templates/reports/cmr/sql/signature.sql b/print/templates/reports/cmr/sql/signature.sql
new file mode 100644
index 0000000000..7ec7380a58
--- /dev/null
+++ b/print/templates/reports/cmr/sql/signature.sql
@@ -0,0 +1,5 @@
+SELECT dc.id `signature`
+ FROM ticket t
+ JOIN ticketDms dt ON dt.ticketFk = t.id
+ LEFT JOIN dms dc ON dc.id = dt.dmsFk
+ WHERE t.id = ?
\ No newline at end of file
diff --git a/print/templates/reports/entry-order/sql/supplier.sql b/print/templates/reports/entry-order/sql/supplier.sql
index 11a2bc602d..81ed7e8835 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 8f072947f0..a86fd42b07 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}}
|