diff --git a/back/methods/collection/previousLabel.js b/back/methods/collection/previousLabel.js index fb2df8133..e3dac1ab4 100644 --- a/back/methods/collection/previousLabel.js +++ b/back/methods/collection/previousLabel.js @@ -1,5 +1,3 @@ -const {Report} = require('vn-print'); - module.exports = Self => { Self.remoteMethodCtx('previousLabel', { description: 'Returns the previa label pdf', @@ -33,17 +31,5 @@ module.exports = Self => { } }); - Self.previousLabel = async(ctx, id) => { - const args = Object.assign({}, ctx.args); - const params = {lang: ctx.req.getLocale()}; - - delete args.ctx; - for (const param in args) - params[param] = args[param]; - - const report = new Report('previa-label', params); - const stream = await report.toPdfStream(); - - return [stream, 'application/pdf', `filename="previa-${id}.pdf"`]; - }; + Self.previousLabel = (ctx, id) => Self.printReport(ctx, id, 'previa-label'); }; diff --git a/loopback/common/methods/vn-model/printService.js b/loopback/common/methods/vn-model/printService.js new file mode 100644 index 000000000..5cd571d4c --- /dev/null +++ b/loopback/common/methods/vn-model/printService.js @@ -0,0 +1,57 @@ +const {Report, Email} = require('vn-print'); + +module.exports = Self => { + Self.printReport = async function(ctx, id, reportName) { + const args = Object.assign({}, ctx.args); + const params = {lang: ctx.req.getLocale()}; + + delete args.ctx; + for (const param in args) + params[param] = args[param]; + + const report = new Report(reportName, params); + const stream = await report.toPdfStream(); + + let fileName = `${reportName}`; + if (id) fileName += `-${id}`; + + return [stream, 'application/pdf', `filename="${fileName}.pdf"`]; + }; + + Self.printEmail = async function(ctx, id, templateName) { + const {accessToken} = ctx.req; + const args = Object.assign({}, ctx.args); + const params = {lang: ctx.req.getLocale()}; + + delete args.ctx; + for (const param in args) + params[param] = args[param]; + + params.isPreview = true; + params.access_token = accessToken.id; + + const report = new Email(templateName, params); + const html = await report.render(); + + let fileName = `${templateName}`; + if (id) fileName += `-${id}`; + + return [html, 'text/html', `filename=${fileName}.pdf"`]; + }; + + Self.sendTemplate = async function(ctx, templateName) { + const args = Object.assign({}, ctx.args); + const params = { + recipient: args.recipient, + lang: ctx.req.getLocale() + }; + + delete args.ctx; + for (const param in args) + params[param] = args[param]; + + const email = new Email(templateName, params); + + return email.send(); + }; +}; diff --git a/loopback/common/models/vn-model.js b/loopback/common/models/vn-model.js index cc3eede8e..cebd37eac 100644 --- a/loopback/common/models/vn-model.js +++ b/loopback/common/models/vn-model.js @@ -7,6 +7,7 @@ module.exports = function(Self) { require('../methods/vn-model/getSetValues')(Self); require('../methods/vn-model/getEnumValues')(Self); + require('../methods/vn-model/printService')(Self); Object.assign(Self, { setup() { diff --git a/modules/claim/back/methods/claim/claimPickupPdf.js b/modules/claim/back/methods/claim/claimPickupPdf.js index 0e3abe908..4927efa0f 100644 --- a/modules/claim/back/methods/claim/claimPickupPdf.js +++ b/modules/claim/back/methods/claim/claimPickupPdf.js @@ -1,5 +1,3 @@ -const { Report } = require('vn-print'); - module.exports = Self => { Self.remoteMethodCtx('claimPickupPdf', { description: 'Returns the claim pickup order pdf', @@ -39,17 +37,5 @@ module.exports = Self => { } }); - Self.claimPickupPdf = async(ctx, id) => { - const args = Object.assign({}, ctx.args); - const params = {lang: ctx.req.getLocale()}; - - delete args.ctx; - for (const param in args) - params[param] = args[param]; - - const report = new Report('claim-pickup-order', params); - const stream = await report.toPdfStream(); - - return [stream, 'application/pdf', `filename="doc-${id}.pdf"`]; - }; + Self.claimPickupPdf = (ctx, id) => Self.printReport(ctx, id, 'claim-pickup-order'); }; diff --git a/modules/client/back/methods/client/campaignMetricsEmail.js b/modules/client/back/methods/client/campaignMetricsEmail.js index bb57f90a0..3a1bac5e6 100644 --- a/modules/client/back/methods/client/campaignMetricsEmail.js +++ b/modules/client/back/methods/client/campaignMetricsEmail.js @@ -51,19 +51,5 @@ module.exports = Self => { } }); - Self.campaignMetricsEmail = async ctx => { - const args = Object.assign({}, ctx.args); - const params = { - recipient: args.recipient, - lang: ctx.req.getLocale() - }; - - delete args.ctx; - for (const param in args) - params[param] = args[param]; - - const email = new Email('campaign-metrics', params); - - return email.send(); - }; + Self.campaignMetricsEmail = ctx => Self.sendTemplate(ctx, 'campaign-metrics'); }; diff --git a/modules/client/back/methods/client/campaignMetricsPdf.js b/modules/client/back/methods/client/campaignMetricsPdf.js index 14194d62b..e163b0619 100644 --- a/modules/client/back/methods/client/campaignMetricsPdf.js +++ b/modules/client/back/methods/client/campaignMetricsPdf.js @@ -1,5 +1,3 @@ -const {Report} = require('vn-print'); - module.exports = Self => { Self.remoteMethodCtx('campaignMetricsPdf', { description: 'Returns the campaign metrics pdf', @@ -50,17 +48,5 @@ module.exports = Self => { } }); - Self.campaignMetricsPdf = async(ctx, id) => { - const args = Object.assign({}, ctx.args); - const params = {lang: ctx.req.getLocale()}; - - delete args.ctx; - for (const param in args) - params[param] = args[param]; - - const report = new Report('campaign-metrics', params); - const stream = await report.toPdfStream(); - - return [stream, 'application/pdf', `filename="doc-${id}.pdf"`]; - }; + Self.campaignMetricsPdf = (ctx, id) => Self.printReport(ctx, id, 'campaign-metrics'); }; diff --git a/modules/client/back/methods/client/clientDebtStatementEmail.js b/modules/client/back/methods/client/clientDebtStatementEmail.js index 8bcdc900f..1b3ab13d8 100644 --- a/modules/client/back/methods/client/clientDebtStatementEmail.js +++ b/modules/client/back/methods/client/clientDebtStatementEmail.js @@ -46,19 +46,5 @@ module.exports = Self => { } }); - Self.clientDebtStatementEmail = async ctx => { - const args = Object.assign({}, ctx.args); - const params = { - recipient: args.recipient, - lang: ctx.req.getLocale() - }; - - delete args.ctx; - for (const param in args) - params[param] = args[param]; - - const email = new Email('client-debt-statement', params); - - return email.send(); - }; + Self.clientDebtStatementEmail = ctx => Self.sendTemplate(ctx, 'client-debt-statement'); }; diff --git a/modules/client/back/methods/client/clientDebtStatementHtml.js b/modules/client/back/methods/client/clientDebtStatementHtml.js index bfed696bc..8752b48d2 100644 --- a/modules/client/back/methods/client/clientDebtStatementHtml.js +++ b/modules/client/back/methods/client/clientDebtStatementHtml.js @@ -1,5 +1,3 @@ -const {Email} = require('vn-print'); - module.exports = Self => { Self.remoteMethodCtx('clientDebtStatementHtml', { description: 'Returns the client debt statement email preview', @@ -45,21 +43,5 @@ module.exports = Self => { } }); - Self.clientDebtStatementHtml = async(ctx, id) => { - const {accessToken} = ctx.req; - const args = Object.assign({}, ctx.args); - const params = {lang: ctx.req.getLocale()}; - - delete args.ctx; - for (const param in args) - params[param] = args[param]; - - params.isPreview = true; - params.access_token = accessToken.id; - - const report = new Email('client-debt-statement', params); - const html = await report.render(); - - return [html, 'text/html', `filename="mail-${id}.pdf"`]; - }; + Self.clientDebtStatementHtml = (ctx, id) => Self.printEmail(ctx, id, 'client-debt-statement'); }; diff --git a/modules/client/back/methods/client/clientDebtStatementPdf.js b/modules/client/back/methods/client/clientDebtStatementPdf.js index 8e2dca314..845527ace 100644 --- a/modules/client/back/methods/client/clientDebtStatementPdf.js +++ b/modules/client/back/methods/client/clientDebtStatementPdf.js @@ -1,5 +1,3 @@ -const {Report} = require('vn-print'); - module.exports = Self => { Self.remoteMethodCtx('clientDebtStatementPdf', { description: 'Returns the client debt statement pdf', @@ -45,17 +43,5 @@ module.exports = Self => { } }); - Self.clientDebtStatementPdf = async(ctx, id) => { - const args = Object.assign({}, ctx.args); - const params = {lang: ctx.req.getLocale()}; - - delete args.ctx; - for (const param in args) - params[param] = args[param]; - - const report = new Report('client-debt-statement', params); - const stream = await report.toPdfStream(); - - return [stream, 'application/pdf', `filename="doc-${id}.pdf"`]; - }; + Self.clientDebtStatementPdf = (ctx, id) => Self.printReport(ctx, id, 'client-debt-statement'); }; diff --git a/modules/client/back/methods/client/clientWelcomeEmail.js b/modules/client/back/methods/client/clientWelcomeEmail.js index 318ee18e6..accf12bb8 100644 --- a/modules/client/back/methods/client/clientWelcomeEmail.js +++ b/modules/client/back/methods/client/clientWelcomeEmail.js @@ -1,5 +1,3 @@ -const {Email} = require('vn-print'); - module.exports = Self => { Self.remoteMethodCtx('clientWelcomeEmail', { description: 'Sends the client welcome email with an attached PDF', @@ -41,19 +39,5 @@ module.exports = Self => { } }); - Self.clientWelcomeEmail = async ctx => { - const args = Object.assign({}, ctx.args); - const params = { - recipient: args.recipient, - lang: ctx.req.getLocale() - }; - - delete args.ctx; - for (const param in args) - params[param] = args[param]; - - const email = new Email('client-welcome', params); - - return email.send(); - }; + Self.clientWelcomeEmail = ctx => Self.sendTemplate(ctx, 'client-welcome'); }; diff --git a/modules/client/back/methods/client/clientWelcomeHtml.js b/modules/client/back/methods/client/clientWelcomeHtml.js index dfb560326..093a06d8e 100644 --- a/modules/client/back/methods/client/clientWelcomeHtml.js +++ b/modules/client/back/methods/client/clientWelcomeHtml.js @@ -1,5 +1,3 @@ -const {Email} = require('vn-print'); - module.exports = Self => { Self.remoteMethodCtx('clientWelcomeHtml', { description: 'Returns the client welcome email preview', @@ -40,19 +38,5 @@ module.exports = Self => { } }); - Self.clientWelcomeHtml = async(ctx, id) => { - const args = Object.assign({}, ctx.args); - const params = {lang: ctx.req.getLocale()}; - - delete args.ctx; - for (const param in args) - params[param] = args[param]; - - params.isPreview = true; - - const report = new Email('client-welcome', params); - const html = await report.render(); - - return [html, 'text/html', `filename="mail-${id}.pdf"`]; - }; + Self.clientWelcomeHtml = (ctx, id) => Self.printEmail(ctx, id, 'client-welcome'); }; diff --git a/modules/client/back/methods/client/creditRequestEmail.js b/modules/client/back/methods/client/creditRequestEmail.js index b6a60e971..0255949e0 100644 --- a/modules/client/back/methods/client/creditRequestEmail.js +++ b/modules/client/back/methods/client/creditRequestEmail.js @@ -1,5 +1,3 @@ -const {Email} = require('vn-print'); - module.exports = Self => { Self.remoteMethodCtx('clientCreditEmail', { description: 'Sends the credit request email with an attached PDF', @@ -10,7 +8,7 @@ module.exports = Self => { type: 'number', required: true, description: 'The client id', - http: {source: 'path'} + http: {source: 'path'}, }, { arg: 'recipient', @@ -22,38 +20,25 @@ module.exports = Self => { arg: 'replyTo', type: 'string', description: 'The sender email to reply to', - required: false + required: false, }, { arg: 'recipientId', type: 'number', - description: 'The recipient id to send to the recipient preferred language', - required: false - } + description: + 'The recipient id to send to the recipient preferred language', + required: false, + }, ], returns: { type: ['object'], - root: true + root: true, }, http: { path: '/:id/credit-request-email', - verb: 'POST' - } + verb: 'POST', + }, }); - Self.clientCreditEmail = async ctx => { - const args = Object.assign({}, ctx.args); - const params = { - recipient: args.recipient, - lang: ctx.req.getLocale() - }; - - delete args.ctx; - for (const param in args) - params[param] = args[param]; - - const email = new Email('credit-request', params); - - return email.send(); - }; + Self.clientCreditEmail = ctx => Self.sendTemplate(ctx, 'credit-request'); }; diff --git a/modules/client/back/methods/client/creditRequestHtml.js b/modules/client/back/methods/client/creditRequestHtml.js index 6b2d7fe4e..fbd6cacb9 100644 --- a/modules/client/back/methods/client/creditRequestHtml.js +++ b/modules/client/back/methods/client/creditRequestHtml.js @@ -1,5 +1,3 @@ -const {Email} = require('vn-print'); - module.exports = Self => { Self.remoteMethodCtx('creditRequestHtml', { description: 'Returns the credit request email preview', @@ -40,21 +38,5 @@ module.exports = Self => { } }); - Self.creditRequestHtml = async(ctx, id) => { - const {accessToken} = ctx.req; - const args = Object.assign({}, ctx.args); - const params = {lang: ctx.req.getLocale()}; - - delete args.ctx; - for (const param in args) - params[param] = args[param]; - - params.isPreview = true; - params.access_token = accessToken.id; - - const report = new Email('credit-request', params); - const html = await report.render(); - - return [html, 'text/html', `filename="mail-${id}.pdf"`]; - }; + Self.creditRequestHtml = (ctx, id) => Self.printEmail(ctx, id, 'credit-request'); }; diff --git a/modules/client/back/methods/client/creditRequestPdf.js b/modules/client/back/methods/client/creditRequestPdf.js index 2e3dc0619..a4f4ed128 100644 --- a/modules/client/back/methods/client/creditRequestPdf.js +++ b/modules/client/back/methods/client/creditRequestPdf.js @@ -1,5 +1,3 @@ -const {Report} = require('vn-print'); - module.exports = Self => { Self.remoteMethodCtx('creditRequestPdf', { description: 'Returns the credit request pdf', @@ -40,17 +38,5 @@ module.exports = Self => { } }); - Self.creditRequestPdf = async(ctx, id) => { - const args = Object.assign({}, ctx.args); - const params = {lang: ctx.req.getLocale()}; - - delete args.ctx; - for (const param in args) - params[param] = args[param]; - - const report = new Report('credit-request', params); - const stream = await report.toPdfStream(); - - return [stream, 'application/pdf', `filename="doc-${id}.pdf"`]; - }; + Self.creditRequestPdf = (ctx, id) => Self.printReport(ctx, id, 'credit-request'); }; diff --git a/modules/client/back/methods/client/incotermsAuthorizationEmail.js b/modules/client/back/methods/client/incotermsAuthorizationEmail.js index 2a4fe593a..4a21f20b0 100644 --- a/modules/client/back/methods/client/incotermsAuthorizationEmail.js +++ b/modules/client/back/methods/client/incotermsAuthorizationEmail.js @@ -1,5 +1,3 @@ -const {Email} = require('vn-print'); - module.exports = Self => { Self.remoteMethodCtx('incotermsAuthorizationEmail', { description: 'Sends the incoterms authorization email with an attached PDF', @@ -47,19 +45,5 @@ module.exports = Self => { } }); - Self.incotermsAuthorizationEmail = async ctx => { - const args = Object.assign({}, ctx.args); - const params = { - recipient: args.recipient, - lang: ctx.req.getLocale() - }; - - delete args.ctx; - for (const param in args) - params[param] = args[param]; - - const email = new Email('incoterms-authorization', params); - - return email.send(); - }; + Self.incotermsAuthorizationEmail = ctx => Self.sendTemplate(ctx, 'incoterms-authorization'); }; diff --git a/modules/client/back/methods/client/incotermsAuthorizationHtml.js b/modules/client/back/methods/client/incotermsAuthorizationHtml.js index 875495d93..0a6bba0a8 100644 --- a/modules/client/back/methods/client/incotermsAuthorizationHtml.js +++ b/modules/client/back/methods/client/incotermsAuthorizationHtml.js @@ -1,5 +1,3 @@ -const {Email} = require('vn-print'); - module.exports = Self => { Self.remoteMethodCtx('incotermsAuthorizationHtml', { description: 'Returns the incoterms authorization email preview', @@ -46,21 +44,5 @@ module.exports = Self => { } }); - Self.incotermsAuthorizationHtml = async(ctx, id) => { - const {accessToken} = ctx.req; - const args = Object.assign({}, ctx.args); - const params = {lang: ctx.req.getLocale()}; - - delete args.ctx; - for (const param in args) - params[param] = args[param]; - - params.isPreview = true; - params.access_token = accessToken.id; - - const report = new Email('incoterms-authorization', params); - const html = await report.render(); - - return [html, 'text/html', `filename="mail-${id}.pdf"`]; - }; + Self.incotermsAuthorizationHtml = (ctx, id) => Self.printEmail(ctx, id, 'incoterms-authorization'); }; diff --git a/modules/client/back/methods/client/incotermsAuthorizationPdf.js b/modules/client/back/methods/client/incotermsAuthorizationPdf.js index 9a8a8d296..d37e473f1 100644 --- a/modules/client/back/methods/client/incotermsAuthorizationPdf.js +++ b/modules/client/back/methods/client/incotermsAuthorizationPdf.js @@ -1,5 +1,3 @@ -const {Report} = require('vn-print'); - module.exports = Self => { Self.remoteMethodCtx('incotermsAuthorizationPdf', { description: 'Returns the incoterms authorization pdf', @@ -46,17 +44,5 @@ module.exports = Self => { } }); - Self.incotermsAuthorizationPdf = async(ctx, id) => { - const args = Object.assign({}, ctx.args); - const params = {lang: ctx.req.getLocale()}; - - delete args.ctx; - for (const param in args) - params[param] = args[param]; - - const report = new Report('incoterms-authorization', params); - const stream = await report.toPdfStream(); - - return [stream, 'application/pdf', `filename="doc-${id}.pdf"`]; - }; + Self.incotermsAuthorizationPdf = (ctx, id) => Self.printReport(ctx, id, 'incoterms-authorization'); }; diff --git a/modules/client/back/methods/client/letterDebtorNdEmail.js b/modules/client/back/methods/client/letterDebtorNdEmail.js index e188c6e0a..396acdb97 100644 --- a/modules/client/back/methods/client/letterDebtorNdEmail.js +++ b/modules/client/back/methods/client/letterDebtorNdEmail.js @@ -1,5 +1,3 @@ -const {Email} = require('vn-print'); - module.exports = Self => { Self.remoteMethodCtx('letterDebtorNdEmail', { description: 'Sends the second debtor letter email with an attached PDF', @@ -47,19 +45,5 @@ module.exports = Self => { } }); - Self.letterDebtorNdEmail = async ctx => { - const args = Object.assign({}, ctx.args); - const params = { - recipient: args.recipient, - lang: ctx.req.getLocale() - }; - - delete args.ctx; - for (const param in args) - params[param] = args[param]; - - const email = new Email('letter-debtor-nd', params); - - return email.send(); - }; + Self.letterDebtorNdEmail = ctx => Self.sendTemplate(ctx, 'letter-debtor-nd'); }; diff --git a/modules/client/back/methods/client/letterDebtorNdHtml.js b/modules/client/back/methods/client/letterDebtorNdHtml.js index 320fbaef3..f14f96dea 100644 --- a/modules/client/back/methods/client/letterDebtorNdHtml.js +++ b/modules/client/back/methods/client/letterDebtorNdHtml.js @@ -1,5 +1,3 @@ -const {Email} = require('vn-print'); - module.exports = Self => { Self.remoteMethodCtx('letterDebtorNdHtml', { description: 'Returns the second letter debtor email preview', @@ -46,21 +44,5 @@ module.exports = Self => { } }); - Self.letterDebtorNdHtml = async(ctx, id) => { - const {accessToken} = ctx.req; - const args = Object.assign({}, ctx.args); - const params = {lang: ctx.req.getLocale()}; - - delete args.ctx; - for (const param in args) - params[param] = args[param]; - - params.isPreview = true; - params.access_token = accessToken.id; - - const report = new Email('letter-debtor-nd', params); - const html = await report.render(); - - return [html, 'text/html', `filename="mail-${id}.pdf"`]; - }; + Self.letterDebtorNdHtml = (ctx, id) => Self.printEmail(ctx, id, 'letter-debtor-nd'); }; diff --git a/modules/client/back/methods/client/letterDebtorPdf.js b/modules/client/back/methods/client/letterDebtorPdf.js index 421d531e6..943869143 100644 --- a/modules/client/back/methods/client/letterDebtorPdf.js +++ b/modules/client/back/methods/client/letterDebtorPdf.js @@ -1,5 +1,3 @@ -const {Report} = require('vn-print'); - module.exports = Self => { Self.remoteMethodCtx('letterDebtorPdf', { description: 'Returns the letter debtor pdf', @@ -46,17 +44,5 @@ module.exports = Self => { } }); - Self.letterDebtorPdf = async(ctx, id) => { - const args = Object.assign({}, ctx.args); - const params = {lang: ctx.req.getLocale()}; - - delete args.ctx; - for (const param in args) - params[param] = args[param]; - - const report = new Report('letter-debtor', params); - const stream = await report.toPdfStream(); - - return [stream, 'application/pdf', `filename="doc-${id}.pdf"`]; - }; + Self.letterDebtorPdf = (ctx, id) => Self.printReport(ctx, id, 'letter-debtor'); }; diff --git a/modules/client/back/methods/client/letterDebtorStEmail.js b/modules/client/back/methods/client/letterDebtorStEmail.js index ee39a101b..c76204fbc 100644 --- a/modules/client/back/methods/client/letterDebtorStEmail.js +++ b/modules/client/back/methods/client/letterDebtorStEmail.js @@ -1,5 +1,3 @@ -const {Email} = require('vn-print'); - module.exports = Self => { Self.remoteMethodCtx('letterDebtorStEmail', { description: 'Sends the printer setup email with an attached PDF', @@ -47,19 +45,5 @@ module.exports = Self => { } }); - Self.letterDebtorStEmail = async ctx => { - const args = Object.assign({}, ctx.args); - const params = { - recipient: args.recipient, - lang: ctx.req.getLocale() - }; - - delete args.ctx; - for (const param in args) - params[param] = args[param]; - - const email = new Email('letter-debtor-st', params); - - return email.send(); - }; + Self.letterDebtorStEmail = ctx => Self.sendTemplate(ctx, 'letter-debtor-st'); }; diff --git a/modules/client/back/methods/client/letterDebtorStHtml.js b/modules/client/back/methods/client/letterDebtorStHtml.js index acf75272b..a1dcf00d7 100644 --- a/modules/client/back/methods/client/letterDebtorStHtml.js +++ b/modules/client/back/methods/client/letterDebtorStHtml.js @@ -1,5 +1,3 @@ -const {Email} = require('vn-print'); - module.exports = Self => { Self.remoteMethodCtx('letterDebtorStHtml', { description: 'Returns the letter debtor email preview', @@ -46,21 +44,5 @@ module.exports = Self => { } }); - Self.letterDebtorStHtml = async(ctx, id) => { - const {accessToken} = ctx.req; - const args = Object.assign({}, ctx.args); - const params = {lang: ctx.req.getLocale()}; - - delete args.ctx; - for (const param in args) - params[param] = args[param]; - - params.isPreview = true; - params.access_token = accessToken.id; - - const report = new Email('letter-debtor-st', params); - const html = await report.render(); - - return [html, 'text/html', `filename="mail-${id}.pdf"`]; - }; + Self.letterDebtorStHtml = (ctx, id) => Self.printEmail(ctx, id, 'letter-debtor-st'); }; diff --git a/modules/client/back/methods/client/printerSetupEmail.js b/modules/client/back/methods/client/printerSetupEmail.js index 254948659..2a0903e90 100644 --- a/modules/client/back/methods/client/printerSetupEmail.js +++ b/modules/client/back/methods/client/printerSetupEmail.js @@ -1,5 +1,3 @@ -const {Email} = require('vn-print'); - module.exports = Self => { Self.remoteMethodCtx('printerSetupEmail', { description: 'Sends the printer setup email with an attached PDF', @@ -41,19 +39,5 @@ module.exports = Self => { } }); - Self.printerSetupEmail = async ctx => { - const args = Object.assign({}, ctx.args); - const params = { - recipient: args.recipient, - lang: ctx.req.getLocale() - }; - - delete args.ctx; - for (const param in args) - params[param] = args[param]; - - const email = new Email('printer-setup', params); - - return email.send(); - }; + Self.printerSetupEmail = ctx => Self.sendTemplate(ctx, 'printer-setup'); }; diff --git a/modules/client/back/methods/client/printerSetupHtml.js b/modules/client/back/methods/client/printerSetupHtml.js index 1ef1843e0..c9d94d1c2 100644 --- a/modules/client/back/methods/client/printerSetupHtml.js +++ b/modules/client/back/methods/client/printerSetupHtml.js @@ -1,5 +1,3 @@ -const {Email} = require('vn-print'); - module.exports = Self => { Self.remoteMethodCtx('printerSetupHtml', { description: 'Returns the printer setup email preview', @@ -40,19 +38,5 @@ module.exports = Self => { } }); - Self.printerSetupHtml = async(ctx, id) => { - const args = Object.assign({}, ctx.args); - const params = {lang: ctx.req.getLocale()}; - - delete args.ctx; - for (const param in args) - params[param] = args[param]; - - params.isPreview = true; - - const report = new Email('printer-setup', params); - const html = await report.render(); - - return [html, 'text/html', `filename="mail-${id}.pdf"`]; - }; + Self.printerSetupHtml = (ctx, id) => Self.printEmail(ctx, id, 'printer-setup'); }; diff --git a/modules/client/back/methods/client/sepaCoreEmail.js b/modules/client/back/methods/client/sepaCoreEmail.js index 93c9d4302..20931eb03 100644 --- a/modules/client/back/methods/client/sepaCoreEmail.js +++ b/modules/client/back/methods/client/sepaCoreEmail.js @@ -1,5 +1,3 @@ -const {Email} = require('vn-print'); - module.exports = Self => { Self.remoteMethodCtx('sepaCoreEmail', { description: 'Sends the campaign metrics email with an attached PDF', @@ -47,19 +45,5 @@ module.exports = Self => { } }); - Self.sepaCoreEmail = async ctx => { - const args = Object.assign({}, ctx.args); - const params = { - recipient: args.recipient, - lang: ctx.req.getLocale() - }; - - delete args.ctx; - for (const param in args) - params[param] = args[param]; - - const email = new Email('sepa-core', params); - - return email.send(); - }; + Self.sepaCoreEmail = ctx => Self.sendTemplate(ctx, 'sepa-core'); }; diff --git a/modules/client/back/methods/receipt/balanceCompensationPdf.js b/modules/client/back/methods/receipt/balanceCompensationPdf.js index ff8713253..e790d54a1 100644 --- a/modules/client/back/methods/receipt/balanceCompensationPdf.js +++ b/modules/client/back/methods/receipt/balanceCompensationPdf.js @@ -1,5 +1,3 @@ -const { Report } = require('vn-print'); - module.exports = Self => { Self.remoteMethodCtx('balanceCompensationPdf', { description: 'Returns the the debit balances compensation pdf', @@ -10,7 +8,7 @@ module.exports = Self => { type: 'number', required: true, description: 'The receipt id', - http: { source: 'path' } + http: {source: 'path'} } ], returns: [ @@ -34,17 +32,5 @@ module.exports = Self => { } }); - Self.balanceCompensationPdf = async(ctx, id) => { - const args = Object.assign({}, ctx.args); - const params = {lang: ctx.req.getLocale()}; - - delete args.ctx; - for (const param in args) - params[param] = args[param]; - - const report = new Report('balance-compensation', params); - const stream = await report.toPdfStream(); - - return [stream, 'application/pdf', `filename="doc-${id}.pdf"`]; - }; + Self.balanceCompensationPdf = (ctx, id) => Self.printReport(ctx, id, 'balance-compensation'); }; diff --git a/modules/client/back/methods/receipt/receiptPdf.js b/modules/client/back/methods/receipt/receiptPdf.js index f55e05040..433f386db 100644 --- a/modules/client/back/methods/receipt/receiptPdf.js +++ b/modules/client/back/methods/receipt/receiptPdf.js @@ -1,5 +1,3 @@ -const {Report} = require('vn-print'); - module.exports = Self => { Self.remoteMethodCtx('receiptPdf', { description: 'Returns the receipt pdf', @@ -39,17 +37,5 @@ module.exports = Self => { } }); - Self.receiptPdf = async(ctx, id) => { - const args = Object.assign({}, ctx.args); - const params = {lang: ctx.req.getLocale()}; - - delete args.ctx; - for (const param in args) - params[param] = args[param]; - - const report = new Report('receipt', params); - const stream = await report.toPdfStream(); - - return [stream, 'application/pdf', `filename="doc-${id}.pdf"`]; - }; + Self.receiptPdf = (ctx, id) => Self.printReport(ctx, id, 'receipt'); }; diff --git a/modules/entry/back/methods/entry/entryOrderPdf.js b/modules/entry/back/methods/entry/entryOrderPdf.js index e6d37fdb6..f77832162 100644 --- a/modules/entry/back/methods/entry/entryOrderPdf.js +++ b/modules/entry/back/methods/entry/entryOrderPdf.js @@ -1,5 +1,3 @@ -const {Report} = require('vn-print'); - module.exports = Self => { Self.remoteMethodCtx('entryOrderPdf', { description: 'Returns the entry order pdf', @@ -38,17 +36,5 @@ module.exports = Self => { } }); - Self.entryOrderPdf = async(ctx, id) => { - const args = Object.assign({}, ctx.args); - const params = {lang: ctx.req.getLocale()}; - - delete args.ctx; - for (const param in args) - params[param] = args[param]; - - const report = new Report('entry-order', params); - const stream = await report.toPdfStream(); - - return [stream, 'application/pdf', `filename="doc-${id}.pdf"`]; - }; + Self.entryOrderPdf = (ctx, id) => Self.printReport(ctx, id, 'entry-order'); }; diff --git a/modules/invoiceIn/back/methods/invoice-in/invoiceInEmail.js b/modules/invoiceIn/back/methods/invoice-in/invoiceInEmail.js index 0768541a8..a0af3da69 100644 --- a/modules/invoiceIn/back/methods/invoice-in/invoiceInEmail.js +++ b/modules/invoiceIn/back/methods/invoice-in/invoiceInEmail.js @@ -1,5 +1,3 @@ -const {Email} = require('vn-print'); - module.exports = Self => { Self.remoteMethodCtx('invoiceInEmail', { description: 'Sends the invoice in email with an attached PDF', @@ -35,19 +33,5 @@ module.exports = Self => { } }); - Self.invoiceInEmail = async ctx => { - const args = Object.assign({}, ctx.args); - const params = { - recipient: args.recipient, - lang: ctx.req.getLocale() - }; - - delete args.ctx; - for (const param in args) - params[param] = args[param]; - - const email = new Email('invoiceIn', params); - - return email.send(); - }; + Self.invoiceInEmail = ctx => Self.sendTemplate(ctx, 'invoiceIn'); }; diff --git a/modules/invoiceIn/back/methods/invoice-in/invoiceInPdf.js b/modules/invoiceIn/back/methods/invoice-in/invoiceInPdf.js index e7962c93f..681a19fc6 100644 --- a/modules/invoiceIn/back/methods/invoice-in/invoiceInPdf.js +++ b/modules/invoiceIn/back/methods/invoice-in/invoiceInPdf.js @@ -1,5 +1,3 @@ -const {Report} = require('vn-print'); - module.exports = Self => { Self.remoteMethodCtx('invoiceInPdf', { description: 'Returns the invoiceIn pdf', @@ -34,17 +32,5 @@ module.exports = Self => { } }); - Self.invoiceInPdf = async(ctx, id) => { - const args = Object.assign({}, ctx.args); - const params = {lang: ctx.req.getLocale()}; - delete args.ctx; - - for (const param in args) - params[param] = args[param]; - - const report = new Report('invoiceIn', params); - const stream = await report.toPdfStream(); - - return [stream, 'application/pdf', `filename="doc-${id}.pdf"`]; - }; + Self.invoiceInPdf = (ctx, id) => Self.printReport(ctx, id, 'invoiceIn'); }; diff --git a/modules/invoiceOut/back/methods/invoiceOut/exportationPdf.js b/modules/invoiceOut/back/methods/invoiceOut/exportationPdf.js index e947c5144..7a2526b35 100644 --- a/modules/invoiceOut/back/methods/invoiceOut/exportationPdf.js +++ b/modules/invoiceOut/back/methods/invoiceOut/exportationPdf.js @@ -1,5 +1,3 @@ -const {Report} = require('vn-print'); - module.exports = Self => { Self.remoteMethodCtx('exportationPdf', { description: 'Returns the exportation pdf', @@ -39,17 +37,5 @@ module.exports = Self => { } }); - Self.exportationPdf = async(ctx, reference) => { - const args = Object.assign({}, ctx.args); - const params = {lang: ctx.req.getLocale()}; - - delete args.ctx; - for (const param in args) - params[param] = args[param]; - - const report = new Report('exportation', params); - const stream = await report.toPdfStream(); - - return [stream, 'application/pdf', `filename="doc-${reference}.pdf"`]; - }; + Self.exportationPdf = (ctx, reference) => Self.printReport(ctx, reference, 'exportation'); }; diff --git a/modules/item/back/methods/item/labelPdf.js b/modules/item/back/methods/item/labelPdf.js index 747869b37..c2462353d 100644 --- a/modules/item/back/methods/item/labelPdf.js +++ b/modules/item/back/methods/item/labelPdf.js @@ -1,5 +1,3 @@ -const {Report} = require('vn-print'); - module.exports = Self => { Self.remoteMethodCtx('labelPdf', { description: 'Returns the item label pdf', @@ -56,17 +54,5 @@ module.exports = Self => { } }); - Self.labelPdf = async(ctx, id) => { - const args = Object.assign({}, ctx.args); - const params = {lang: ctx.req.getLocale()}; - - delete args.ctx; - for (const param in args) - params[param] = args[param]; - - const report = new Report('item-label', params); - const stream = await report.toPdfStream(); - - return [stream, 'application/pdf', `filename="item-${id}.pdf"`]; - }; + Self.labelPdf = (ctx, id) => Self.printReport(ctx, id, 'item-label'); }; diff --git a/modules/route/back/methods/route/driverRouteEmail.js b/modules/route/back/methods/route/driverRouteEmail.js index 4d5279d2d..82b005e44 100644 --- a/modules/route/back/methods/route/driverRouteEmail.js +++ b/modules/route/back/methods/route/driverRouteEmail.js @@ -1,5 +1,3 @@ -const {Email} = require('vn-print'); - module.exports = Self => { Self.remoteMethodCtx('driverRouteEmail', { description: 'Sends the driver route email with an attached PDF', @@ -41,19 +39,5 @@ module.exports = Self => { } }); - Self.driverRouteEmail = async ctx => { - const args = Object.assign({}, ctx.args); - const params = { - recipient: args.recipient, - lang: ctx.req.getLocale() - }; - - delete args.ctx; - for (const param in args) - params[param] = args[param]; - - const email = new Email('driver-route', params); - - return email.send(); - }; + Self.driverRouteEmail = ctx => Self.sendTemplate(ctx, 'driver-route'); }; diff --git a/modules/route/back/methods/route/driverRoutePdf.js b/modules/route/back/methods/route/driverRoutePdf.js index 65748afad..f0cd75f0e 100644 --- a/modules/route/back/methods/route/driverRoutePdf.js +++ b/modules/route/back/methods/route/driverRoutePdf.js @@ -1,5 +1,3 @@ -const {Report} = require('vn-print'); - module.exports = Self => { Self.remoteMethodCtx('driverRoutePdf', { description: 'Returns the driver route pdf', @@ -39,17 +37,5 @@ module.exports = Self => { } }); - Self.driverRoutePdf = async(ctx, id) => { - const args = Object.assign({}, ctx.args); - const params = {lang: ctx.req.getLocale()}; - - delete args.ctx; - for (const param in args) - params[param] = args[param]; - - const report = new Report('driver-route', params); - const stream = await report.toPdfStream(); - - return [stream, 'application/pdf', `filename="doc-${id}.pdf"`]; - }; + Self.driverRoutePdf = (ctx, id) => Self.printReport(ctx, id, 'driver-route'); }; diff --git a/modules/supplier/back/methods/supplier/campaignMetricsPdf.js b/modules/supplier/back/methods/supplier/campaignMetricsPdf.js index 7bd65ffcb..f7ff900e7 100644 --- a/modules/supplier/back/methods/supplier/campaignMetricsPdf.js +++ b/modules/supplier/back/methods/supplier/campaignMetricsPdf.js @@ -1,5 +1,3 @@ -const {Report} = require('vn-print'); - module.exports = Self => { Self.remoteMethodCtx('campaignMetricsPdf', { description: 'Returns the campaign metrics pdf', @@ -49,17 +47,5 @@ module.exports = Self => { } }); - Self.campaignMetricsPdf = async(ctx, id) => { - const args = Object.assign({}, ctx.args); - const params = {lang: ctx.req.getLocale()}; - - delete args.ctx; - for (const param in args) - params[param] = args[param]; - - const report = new Report('supplier-campaign-metrics', params); - const stream = await report.toPdfStream(); - - return [stream, 'application/pdf', `filename="doc-${id}.pdf"`]; - }; + Self.campaignMetricsPdf = (ctx, id) => Self.printReport(ctx, id, 'supplier-campaign-metrics'); }; diff --git a/modules/ticket/back/methods/ticket/collectionLabel.js b/modules/ticket/back/methods/ticket/collectionLabel.js index 7601961fb..74b5b2c0a 100644 --- a/modules/ticket/back/methods/ticket/collectionLabel.js +++ b/modules/ticket/back/methods/ticket/collectionLabel.js @@ -1,5 +1,3 @@ -const {Report} = require('vn-print'); - module.exports = Self => { Self.remoteMethodCtx('collectionLabel', { description: 'Returns the collection label', @@ -39,17 +37,5 @@ module.exports = Self => { } }); - Self.collectionLabel = async(ctx, id) => { - const args = Object.assign({}, ctx.args); - const params = {lang: ctx.req.getLocale()}; - - delete args.ctx; - for (const param in args) - params[param] = args[param]; - - const report = new Report('collection-label', params); - const stream = await report.toPdfStream(); - - return [stream, 'application/pdf', `filename="doc-${id}.pdf"`]; - }; + Self.collectionLabel = (ctx, id) => Self.printReport(ctx, id, 'collection-label'); }; diff --git a/modules/ticket/back/methods/ticket/deliveryNoteEmail.js b/modules/ticket/back/methods/ticket/deliveryNoteEmail.js index cf9f5dd62..4b275b45e 100644 --- a/modules/ticket/back/methods/ticket/deliveryNoteEmail.js +++ b/modules/ticket/back/methods/ticket/deliveryNoteEmail.js @@ -1,5 +1,3 @@ -const {Email} = require('vn-print'); - module.exports = Self => { Self.remoteMethodCtx('deliveryNoteEmail', { description: 'Sends the delivery note email with an attached PDF', @@ -47,19 +45,5 @@ module.exports = Self => { } }); - Self.deliveryNoteEmail = async ctx => { - const args = Object.assign({}, ctx.args); - const params = { - recipient: args.recipient, - lang: ctx.req.getLocale() - }; - - delete args.ctx; - for (const param in args) - params[param] = args[param]; - - const email = new Email('delivery-note', params); - - return email.send(); - }; + Self.deliveryNoteEmail = ctx => Self.sendTemplate(ctx, 'delivery-note'); }; diff --git a/modules/ticket/back/methods/ticket/deliveryNotePdf.js b/modules/ticket/back/methods/ticket/deliveryNotePdf.js index b2b3f7198..628e16bcd 100644 --- a/modules/ticket/back/methods/ticket/deliveryNotePdf.js +++ b/modules/ticket/back/methods/ticket/deliveryNotePdf.js @@ -1,5 +1,3 @@ -const {Report} = require('vn-print'); - module.exports = Self => { Self.remoteMethodCtx('deliveryNotePdf', { description: 'Returns the delivery note pdf', @@ -46,17 +44,5 @@ module.exports = Self => { } }); - Self.deliveryNotePdf = async(ctx, id) => { - const args = Object.assign({}, ctx.args); - const params = {lang: ctx.req.getLocale()}; - - delete args.ctx; - for (const param in args) - params[param] = args[param]; - - const report = new Report('delivery-note', params); - const stream = await report.toPdfStream(); - - return [stream, 'application/pdf', `filename="doc-${id}.pdf"`]; - }; + Self.deliveryNotePdf = (ctx, id) => Self.printReport(ctx, id, 'delivery-note'); }; diff --git a/modules/ticket/back/methods/ticket/expeditionPalletLabel.js b/modules/ticket/back/methods/ticket/expeditionPalletLabel.js index 2215263dd..9830364d6 100644 --- a/modules/ticket/back/methods/ticket/expeditionPalletLabel.js +++ b/modules/ticket/back/methods/ticket/expeditionPalletLabel.js @@ -1,5 +1,3 @@ -const {Report} = require('vn-print'); - module.exports = Self => { Self.remoteMethodCtx('expeditionPalletLabel', { description: 'Returns the expedition pallet label', @@ -39,17 +37,5 @@ module.exports = Self => { } }); - Self.expeditionPalletLabel = async(ctx, id) => { - const args = Object.assign({}, ctx.args); - const params = {lang: ctx.req.getLocale()}; - - delete args.ctx; - for (const param in args) - params[param] = args[param]; - - const report = new Report('expedition-pallet-label', params); - const stream = await report.toPdfStream(); - - return [stream, 'application/pdf', `filename="doc-${id}.pdf"`]; - }; + Self.expeditionPalletLabel = (ctx, id) => Self.printReport(ctx, id, 'expedition-pallet-label'); }; diff --git a/modules/travel/back/methods/travel/extraCommunityEmail.js b/modules/travel/back/methods/travel/extraCommunityEmail.js index dd93ed905..f4b09b79d 100644 --- a/modules/travel/back/methods/travel/extraCommunityEmail.js +++ b/modules/travel/back/methods/travel/extraCommunityEmail.js @@ -1,5 +1,3 @@ -const {Email} = require('vn-print'); - module.exports = Self => { Self.remoteMethodCtx('extraCommunityEmail', { description: 'Sends the extra community email with an attached PDF', @@ -74,19 +72,5 @@ module.exports = Self => { } }); - Self.extraCommunityEmail = async ctx => { - const args = Object.assign({}, ctx.args); - const params = { - recipient: args.recipient, - lang: ctx.req.getLocale() - }; - - delete args.ctx; - for (const param in args) - params[param] = args[param]; - - const email = new Email('extra-community', params); - - return email.send(); - }; + Self.extraCommunityEmail = ctx => Self.sendTemplate(ctx, 'extra-community'); }; diff --git a/modules/travel/back/methods/travel/extraCommunityPdf.js b/modules/travel/back/methods/travel/extraCommunityPdf.js index a68e5cd09..0f8ce4fee 100644 --- a/modules/travel/back/methods/travel/extraCommunityPdf.js +++ b/modules/travel/back/methods/travel/extraCommunityPdf.js @@ -1,5 +1,3 @@ -const {Report} = require('vn-print'); - module.exports = Self => { Self.remoteMethodCtx('extraCommunityPdf', { description: 'Returns the extra community pdf', @@ -73,17 +71,5 @@ module.exports = Self => { } }); - Self.extraCommunityPdf = async ctx => { - const args = Object.assign({}, ctx.args); - const params = {lang: ctx.req.getLocale()}; - - delete args.ctx; - for (const param in args) - params[param] = args[param]; - - const report = new Report('extra-community', params); - const stream = await report.toPdfStream(); - - return [stream, 'application/pdf', `filename="extra-community.pdf"`]; - }; + Self.extraCommunityPdf = ctx => Self.printReport(ctx, null, 'extra-community'); };