Templates refactor

db/changes/10490-august/00-ACL.sql

@@ -3,4 +3,15 @@ INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalTyp
     ('Ticket', 'deliveryNotePdf', 'READ', 'ALLOW', 'ROLE', 'employee'),
     ('Ticket', 'deliveryNoteEmail', 'READ', 'ALLOW', 'ROLE', 'employee'),
     ('Client', 'campaignMetricsPdf', 'READ', 'ALLOW', 'ROLE', 'employee'),
-    ('Client', 'campaignMetricsEmail', 'READ', 'ALLOW', 'ROLE', 'employee');
+    ('Client', 'campaignMetricsEmail', 'READ', 'ALLOW', 'ROLE', 'employee'),
+    ('Client', 'clientWelcomeHtml', 'READ', 'ALLOW', 'ROLE', 'employee'),
+    ('Client', 'clientWelcomeEmail', 'READ', 'ALLOW', 'ROLE', 'employee'),
+    ('Client', 'printerSetupHtml', 'READ', 'ALLOW', 'ROLE', 'employee'),
+    ('Client', 'printerSetupEmail', 'READ', 'ALLOW', 'ROLE', 'employee'),
+    ('Client', 'sepaCoreEmail', 'READ', 'ALLOW', 'ROLE', 'employee'),
+    ('Client', 'letterDebtorStHtml', 'READ', 'ALLOW', 'ROLE', 'employee'),
+    ('Client', 'letterDebtorStEmail', 'READ', 'ALLOW', 'ROLE', 'employee'),
+    ('Client', 'letterDebtorNdHtml', 'READ', 'ALLOW', 'ROLE', 'employee'),
+    ('Client', 'letterDebtorNdEmail', 'READ', 'ALLOW', 'ROLE', 'employee'),
+    ('Client', 'clientDebtStatementHtml', 'READ', 'ALLOW', 'ROLE', 'employee'),
+    ('Client', 'clientDebtStatementEmail', 'READ', 'ALLOW', 'ROLE', 'employee');

db/changes/10490-august/00-sample.sql

@@ -1,17 +1,32 @@
 alter table `vn`.`sample`
     add model VARCHAR(25) null comment 'Model name in plural';
 
-alter table `vn`.`sample`
-    add property VARCHAR(25) null comment 'Remote method property name';
-
-
 UPDATE vn.sample t
-    SET t.model    = 'Clients',
-        t.property = 'printerSetup'
+    SET t.model    = 'Clients'
     WHERE t.id = 13;
 
 UPDATE vn.sample t
-SET t.model    = 'Clients',
-    t.property = 'clientWelcome'
+SET t.model    = 'Clients'
 WHERE t.id = 12;
 
+UPDATE vn.sample t
+SET t.model = 'Clients'
+WHERE t.id = 14;
+
+UPDATE vn.sample t
+SET t.model = 'Clients'
+WHERE t.id = 15;
+
+UPDATE vn.sample t
+SET t.model = 'Clients'
+WHERE t.id = 18;
+
+UPDATE vn.sample t
+SET t.model = 'Clients'
+WHERE t.id = 19;
+
+UPDATE vn.sample t
+SET t.model = 'Clients'
+WHERE t.id = 16;
+
+

modules/client/back/methods/client/campaignMetricsEmail.js

@@ -1,4 +1,4 @@
-const {Report, Email, smtp} = require('vn-print');
+const {Email} = require('vn-print');
 
 module.exports = Self => {
     Self.remoteMethodCtx('campaignMetricsEmail', {
@@ -50,7 +50,7 @@ module.exports = Self => {
         }
     });
 
-    Self.campaignMetricsEmail = async(ctx, id) => { 
+    Self.campaignMetricsEmail = async ctx => {
         const args = Object.assign({}, ctx.args);
         const params = {
             recipient: args.recipient,

modules/client/back/methods/client/campaignMetricsPdf.js

@@ -1,8 +1,8 @@
-const { Report } = require('vn-print');
+const {Report} = require('vn-print');
 
 module.exports = Self => {
     Self.remoteMethodCtx('campaignMetricsPdf', {
-        description: 'Returns the campaign metrics note pdf',
+        description: 'Returns the campaign metrics pdf',
         accepts: [
             {
                 arg: 'id',
@@ -49,7 +49,7 @@ module.exports = Self => {
         }
     });
 
-    Self.campaignMetricsPdf = async(ctx, id) => { 
+    Self.campaignMetricsPdf = async(ctx, id) => {
         const args = Object.assign({}, ctx.args);
         const params = {lang: ctx.req.getLocale()};
 

modules/client/back/methods/client/clientDebtStatementEmail.js

@@ -0,0 +1,63 @@
+const {Email} = require('vn-print');
+
+module.exports = Self => {
+    Self.remoteMethodCtx('clientDebtStatementEmail', {
+        description: 'Sends the client debt statement email with an attached PDF',
+        accepts: [
+            {
+                arg: 'id',
+                type: 'number',
+                required: true,
+                description: 'The client id',
+                http: {source: 'path'}
+            },
+            {
+                arg: 'recipient',
+                type: 'string',
+                description: 'The recipient email',
+                required: true,
+            },
+            {
+                arg: 'replyTo',
+                type: 'string',
+                description: 'The sender email to reply to',
+                required: false
+            },
+            {
+                arg: 'recipientId',
+                type: 'number',
+                description: 'The recipient id to send to the recipient preferred language',
+                required: false
+            },
+            {
+                arg: 'from',
+                type: 'string',
+                required: true
+            }
+        ],
+        returns: {
+            type: ['object'],
+            root: true
+        },
+        http: {
+            path: '/:id/client-debt-statement-email',
+            verb: 'POST'
+        }
+    });
+
+    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();
+    };
+};

modules/client/back/methods/client/clientDebtStatementHtml.js

@@ -0,0 +1,62 @@
+const {Email} = require('vn-print');
+
+module.exports = Self => {
+    Self.remoteMethodCtx('clientDebtStatementHtml', {
+        description: 'Returns the client debt statement email preview',
+        accepts: [
+            {
+                arg: 'id',
+                type: 'number',
+                required: true,
+                description: 'The client id',
+                http: {source: 'path'}
+            },
+            {
+                arg: 'recipientId',
+                type: 'number',
+                description: 'The recipient id',
+                required: false
+            },
+            {
+                arg: 'from',
+                type: 'string',
+                required: true
+            }
+        ],
+        returns: [
+            {
+                arg: 'body',
+                type: 'file',
+                root: true
+            }, {
+                arg: 'Content-Type',
+                type: 'String',
+                http: {target: 'header'}
+            }, {
+                arg: 'Content-Disposition',
+                type: 'String',
+                http: {target: 'header'}
+            }
+        ],
+        http: {
+            path: '/:id/client-debt-statement-html',
+            verb: 'GET'
+        }
+    });
+
+    Self.clientDebtStatementHtml = 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-debt-statement', params);
+        const html = await report.render();
+
+        return [html, 'text/html', `filename="mail-${id}.pdf"`];
+    };
+};

modules/client/back/methods/client/clientWelcomeEmail.js

@@ -0,0 +1,58 @@
+const {Email} = require('vn-print');
+
+module.exports = Self => {
+    Self.remoteMethodCtx('clientWelcomeEmail', {
+        description: 'Sends the client welcome email with an attached PDF',
+        accepts: [
+            {
+                arg: 'id',
+                type: 'number',
+                required: true,
+                description: 'The client id',
+                http: {source: 'path'}
+            },
+            {
+                arg: 'recipient',
+                type: 'string',
+                description: 'The recipient email',
+                required: true,
+            },
+            {
+                arg: 'replyTo',
+                type: 'string',
+                description: 'The sender email to reply to',
+                required: false
+            },
+            {
+                arg: 'recipientId',
+                type: 'number',
+                description: 'The recipient id to send to the recipient preferred language',
+                required: false
+            }
+        ],
+        returns: {
+            type: ['object'],
+            root: true
+        },
+        http: {
+            path: '/:id/client-welcome-email',
+            verb: 'POST'
+        }
+    });
+
+    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();
+    };
+};

modules/client/back/methods/client/clientWelcomeHtml.js

@@ -0,0 +1,57 @@
+const {Email} = require('vn-print');
+
+module.exports = Self => {
+    Self.remoteMethodCtx('clientWelcomeHtml', {
+        description: 'Returns the client welcome email preview',
+        accepts: [
+            {
+                arg: 'id',
+                type: 'number',
+                required: true,
+                description: 'The client id',
+                http: {source: 'path'}
+            },
+            {
+                arg: 'recipientId',
+                type: 'number',
+                description: 'The recipient id',
+                required: false
+            }
+        ],
+        returns: [
+            {
+                arg: 'body',
+                type: 'file',
+                root: true
+            }, {
+                arg: 'Content-Type',
+                type: 'String',
+                http: {target: 'header'}
+            }, {
+                arg: 'Content-Disposition',
+                type: 'String',
+                http: {target: 'header'}
+            }
+        ],
+        http: {
+            path: '/:id/client-welcome-html',
+            verb: 'GET'
+        }
+    });
+
+    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"`];
+    };
+};

modules/client/back/methods/client/creditRequestEmail.js

@@ -0,0 +1,58 @@
+const {Email} = require('vn-print');
+
+module.exports = Self => {
+    Self.remoteMethodCtx('clientCreditEmail', {
+        description: 'Sends the credit request email with an attached PDF',
+        accepts: [
+            {
+                arg: 'id',
+                type: 'number',
+                required: true,
+                description: 'The client id',
+                http: {source: 'path'}
+            },
+            {
+                arg: 'recipient',
+                type: 'string',
+                description: 'The recipient email',
+                required: true,
+            },
+            {
+                arg: 'replyTo',
+                type: 'string',
+                description: 'The sender email to reply to',
+                required: false
+            },
+            {
+                arg: 'recipientId',
+                type: 'number',
+                description: 'The recipient id to send to the recipient preferred language',
+                required: false
+            }
+        ],
+        returns: {
+            type: ['object'],
+            root: true
+        },
+        http: {
+            path: '/:id/credit-request-email',
+            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();
+    };
+};

modules/client/back/methods/client/creditRequestHtml.js

@@ -0,0 +1,57 @@
+const {Email} = require('vn-print');
+
+module.exports = Self => {
+    Self.remoteMethodCtx('creditRequestHtml', {
+        description: 'Returns the credit request email preview',
+        accepts: [
+            {
+                arg: 'id',
+                type: 'number',
+                required: true,
+                description: 'The client id',
+                http: {source: 'path'}
+            },
+            {
+                arg: 'recipientId',
+                type: 'number',
+                description: 'The recipient id',
+                required: false
+            }
+        ],
+        returns: [
+            {
+                arg: 'body',
+                type: 'file',
+                root: true
+            }, {
+                arg: 'Content-Type',
+                type: 'String',
+                http: {target: 'header'}
+            }, {
+                arg: 'Content-Disposition',
+                type: 'String',
+                http: {target: 'header'}
+            }
+        ],
+        http: {
+            path: '/:id/credit-request-html',
+            verb: 'GET'
+        }
+    });
+
+    Self.creditRequestHtml = 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('credit-request', params);
+        const html = await report.render();
+
+        return [html, 'text/html', `filename="mail-${id}.pdf"`];
+    };
+};

modules/client/back/methods/client/letterDebtorNdEmail.js

@@ -0,0 +1,64 @@
+const {Email} = require('vn-print');
+
+module.exports = Self => {
+    Self.remoteMethodCtx('letterDebtorNdEmail', {
+        description: 'Sends the second debtor letter email with an attached PDF',
+        accepts: [
+            {
+                arg: 'id',
+                type: 'number',
+                required: true,
+                description: 'The client id',
+                http: {source: 'path'}
+            },
+            {
+                arg: 'recipient',
+                type: 'string',
+                description: 'The recipient email',
+                required: true,
+            },
+            {
+                arg: 'replyTo',
+                type: 'string',
+                description: 'The sender email to reply to',
+                required: false
+            },
+            {
+                arg: 'recipientId',
+                type: 'number',
+                description: 'The recipient id to send to the recipient preferred language',
+                required: false
+            },
+            {
+                arg: 'companyId',
+                type: 'number',
+                description: 'The company id',
+                required: true
+            }
+        ],
+        returns: {
+            type: ['object'],
+            root: true
+        },
+        http: {
+            path: '/:id/letter-debtor-nd-email',
+            verb: 'POST'
+        }
+    });
+
+    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();
+    };
+};

modules/client/back/methods/client/letterDebtorNdHtml.js

@@ -0,0 +1,63 @@
+const {Email} = require('vn-print');
+
+module.exports = Self => {
+    Self.remoteMethodCtx('letterDebtorNdHtml', {
+        description: 'Returns the second letter debtor email preview',
+        accepts: [
+            {
+                arg: 'id',
+                type: 'number',
+                required: true,
+                description: 'The client id',
+                http: {source: 'path'}
+            },
+            {
+                arg: 'recipientId',
+                type: 'number',
+                description: 'The recipient id',
+                required: false
+            },
+            {
+                arg: 'companyId',
+                type: 'number',
+                description: 'The company id',
+                required: true
+            }
+        ],
+        returns: [
+            {
+                arg: 'body',
+                type: 'file',
+                root: true
+            }, {
+                arg: 'Content-Type',
+                type: 'String',
+                http: {target: 'header'}
+            }, {
+                arg: 'Content-Disposition',
+                type: 'String',
+                http: {target: 'header'}
+            }
+        ],
+        http: {
+            path: '/:id/letter-debtor-nd-html',
+            verb: 'GET'
+        }
+    });
+
+    Self.letterDebtorNdHtml = 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('letter-debtor-nd', params);
+        const html = await report.render();
+
+        return [html, 'text/html', `filename="mail-${id}.pdf"`];
+    };
+};

modules/client/back/methods/client/letterDebtorStEmail.js

@@ -0,0 +1,64 @@
+const {Email} = require('vn-print');
+
+module.exports = Self => {
+    Self.remoteMethodCtx('letterDebtorStEmail', {
+        description: 'Sends the printer setup email with an attached PDF',
+        accepts: [
+            {
+                arg: 'id',
+                type: 'number',
+                required: true,
+                description: 'The client id',
+                http: {source: 'path'}
+            },
+            {
+                arg: 'recipient',
+                type: 'string',
+                description: 'The recipient email',
+                required: true,
+            },
+            {
+                arg: 'replyTo',
+                type: 'string',
+                description: 'The sender email to reply to',
+                required: false
+            },
+            {
+                arg: 'recipientId',
+                type: 'number',
+                description: 'The recipient id to send to the recipient preferred language',
+                required: false
+            },
+            {
+                arg: 'companyId',
+                type: 'number',
+                description: 'The company id',
+                required: true
+            }
+        ],
+        returns: {
+            type: ['object'],
+            root: true
+        },
+        http: {
+            path: '/:id/letter-debtor-st-email',
+            verb: 'POST'
+        }
+    });
+
+    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();
+    };
+};

modules/client/back/methods/client/letterDebtorStHtml.js

@@ -0,0 +1,63 @@
+const {Email} = require('vn-print');
+
+module.exports = Self => {
+    Self.remoteMethodCtx('letterDebtorStHtml', {
+        description: 'Returns the letter debtor email preview',
+        accepts: [
+            {
+                arg: 'id',
+                type: 'number',
+                required: true,
+                description: 'The client id',
+                http: {source: 'path'}
+            },
+            {
+                arg: 'recipientId',
+                type: 'number',
+                description: 'The recipient id',
+                required: false
+            },
+            {
+                arg: 'companyId',
+                type: 'number',
+                description: 'The company id',
+                required: true
+            }
+        ],
+        returns: [
+            {
+                arg: 'body',
+                type: 'file',
+                root: true
+            }, {
+                arg: 'Content-Type',
+                type: 'String',
+                http: {target: 'header'}
+            }, {
+                arg: 'Content-Disposition',
+                type: 'String',
+                http: {target: 'header'}
+            }
+        ],
+        http: {
+            path: '/:id/letter-debtor-st-html',
+            verb: 'GET'
+        }
+    });
+
+    Self.letterDebtorStHtml = 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('letter-debtor-st', params);
+        const html = await report.render();
+
+        return [html, 'text/html', `filename="mail-${id}.pdf"`];
+    };
+};

modules/client/back/methods/client/printerSetupEmail.js

@@ -0,0 +1,58 @@
+const {Email} = require('vn-print');
+
+module.exports = Self => {
+    Self.remoteMethodCtx('printerSetupEmail', {
+        description: 'Sends the printer setup email with an attached PDF',
+        accepts: [
+            {
+                arg: 'id',
+                type: 'number',
+                required: true,
+                description: 'The client id',
+                http: {source: 'path'}
+            },
+            {
+                arg: 'recipient',
+                type: 'string',
+                description: 'The recipient email',
+                required: true,
+            },
+            {
+                arg: 'replyTo',
+                type: 'string',
+                description: 'The sender email to reply to',
+                required: false
+            },
+            {
+                arg: 'recipientId',
+                type: 'number',
+                description: 'The recipient id to send to the recipient preferred language',
+                required: false
+            }
+        ],
+        returns: {
+            type: ['object'],
+            root: true
+        },
+        http: {
+            path: '/:id/printer-setup-email',
+            verb: 'POST'
+        }
+    });
+
+    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();
+    };
+};

modules/client/back/methods/client/printerSetupHtml.js

@@ -0,0 +1,57 @@
+const {Email} = require('vn-print');
+
+module.exports = Self => {
+    Self.remoteMethodCtx('printerSetupHtml', {
+        description: 'Returns the printer setup email preview',
+        accepts: [
+            {
+                arg: 'id',
+                type: 'number',
+                required: true,
+                description: 'The client id',
+                http: {source: 'path'}
+            },
+            {
+                arg: 'recipientId',
+                type: 'number',
+                description: 'The recipient id',
+                required: false
+            }
+        ],
+        returns: [
+            {
+                arg: 'body',
+                type: 'file',
+                root: true
+            }, {
+                arg: 'Content-Type',
+                type: 'String',
+                http: {target: 'header'}
+            }, {
+                arg: 'Content-Disposition',
+                type: 'String',
+                http: {target: 'header'}
+            }
+        ],
+        http: {
+            path: '/:id/printer-setup-html',
+            verb: 'GET'
+        }
+    });
+
+    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"`];
+    };
+};

modules/client/back/methods/client/sepaCoreEmail.js

@@ -0,0 +1,64 @@
+const {Email} = require('vn-print');
+
+module.exports = Self => {
+    Self.remoteMethodCtx('sepaCoreEmail', {
+        description: 'Sends the campaign metrics email with an attached PDF',
+        accepts: [
+            {
+                arg: 'id',
+                type: 'number',
+                required: true,
+                description: 'The client id',
+                http: {source: 'path'}
+            },
+            {
+                arg: 'recipient',
+                type: 'string',
+                description: 'The recipient email',
+                required: true,
+            },
+            {
+                arg: 'replyTo',
+                type: 'string',
+                description: 'The sender email to reply to',
+                required: false
+            },
+            {
+                arg: 'recipientId',
+                type: 'number',
+                description: 'The recipient id to send to the recipient preferred language',
+                required: false
+            },
+            {
+                arg: 'companyId',
+                type: 'number',
+                description: 'The company id',
+                required: true
+            }
+        ],
+        returns: {
+            type: ['object'],
+            root: true
+        },
+        http: {
+            path: '/:id/sepa-core-email',
+            verb: 'POST'
+        }
+    });
+
+    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();
+    };
+};

modules/client/back/models/client-methods.js

@@ -0,0 +1,43 @@
+module.exports = Self => {
+    require('../methods/client/addressesPropagateRe')(Self);
+    require('../methods/client/canBeInvoiced')(Self);
+    require('../methods/client/canCreateTicket')(Self);
+    require('../methods/client/checkDuplicated')(Self);
+    require('../methods/client/confirmTransaction')(Self);
+    require('../methods/client/consumption')(Self);
+    require('../methods/client/createAddress')(Self);
+    require('../methods/client/createReceipt')(Self);
+    require('../methods/client/createWithUser')(Self);
+    require('../methods/client/extendedListFilter')(Self);
+    require('../methods/client/getAverageInvoiced')(Self);
+    require('../methods/client/getCard')(Self);
+    require('../methods/client/getDebt')(Self);
+    require('../methods/client/getMana')(Self);
+    require('../methods/client/getTransactions')(Self);
+    require('../methods/client/hasCustomerRole')(Self);
+    require('../methods/client/isValidClient')(Self);
+    require('../methods/client/lastActiveTickets')(Self);
+    require('../methods/client/sendSms')(Self);
+    require('../methods/client/setPassword')(Self);
+    require('../methods/client/summary')(Self);
+    require('../methods/client/updateAddress')(Self);
+    require('../methods/client/updateFiscalData')(Self);
+    require('../methods/client/updatePortfolio')(Self);
+    require('../methods/client/updateUser')(Self);
+    require('../methods/client/uploadFile')(Self);
+    require('../methods/client/campaignMetricsPdf')(Self);
+    require('../methods/client/campaignMetricsEmail')(Self);
+    require('../methods/client/clientWelcomeHtml')(Self);
+    require('../methods/client/clientWelcomeEmail')(Self);
+    require('../methods/client/printerSetupHtml')(Self);
+    require('../methods/client/printerSetupEmail')(Self);
+    require('../methods/client/sepaCoreEmail')(Self);
+    require('../methods/client/letterDebtorStHtml')(Self);
+    require('../methods/client/letterDebtorStEmail')(Self);
+    require('../methods/client/letterDebtorNdHtml')(Self);
+    require('../methods/client/letterDebtorNdEmail')(Self);
+    require('../methods/client/clientDebtStatementHtml')(Self);
+    require('../methods/client/clientDebtStatementEmail')(Self);
+    require('../methods/client/creditRequestHtml')(Self);
+    require('../methods/client/creditRequestEmail')(Self);
+};

modules/client/back/models/client.js

@@ -8,34 +8,7 @@ const LoopBackContext = require('loopback-context');
 
 module.exports = Self => {
     // Methods
-    require('../methods/client/addressesPropagateRe')(Self);
-    require('../methods/client/canBeInvoiced')(Self);
-    require('../methods/client/canCreateTicket')(Self);
-    require('../methods/client/checkDuplicated')(Self);
-    require('../methods/client/confirmTransaction')(Self);
-    require('../methods/client/consumption')(Self);
-    require('../methods/client/createAddress')(Self);
-    require('../methods/client/createReceipt')(Self);
-    require('../methods/client/createWithUser')(Self);
-    require('../methods/client/extendedListFilter')(Self);
-    require('../methods/client/getAverageInvoiced')(Self);
-    require('../methods/client/getCard')(Self);
-    require('../methods/client/getDebt')(Self);
-    require('../methods/client/getMana')(Self);
-    require('../methods/client/getTransactions')(Self);
-    require('../methods/client/hasCustomerRole')(Self);
-    require('../methods/client/isValidClient')(Self);
-    require('../methods/client/lastActiveTickets')(Self);
-    require('../methods/client/sendSms')(Self);
-    require('../methods/client/setPassword')(Self);
-    require('../methods/client/summary')(Self);
-    require('../methods/client/updateAddress')(Self);
-    require('../methods/client/updateFiscalData')(Self);
-    require('../methods/client/updatePortfolio')(Self);
-    require('../methods/client/updateUser')(Self);
-    require('../methods/client/uploadFile')(Self);
-    require('../methods/client/campaignMetricsPdf')(Self);
-    require('../methods/client/campaignMetricsEmail')(Self);
+    require('./client-methods')(Self);
 
     // Validations
 

modules/client/front/sample/create/index.html

@@ -7,6 +7,15 @@
 <vn-crud-model
     auto-load="true"
     url="Samples/visible"
+    fields="[
+        'id', 
+        'code',
+        'description', 
+        'model',
+        'hasCompany',
+        'hasPreview',
+        'datepickerEnabled'
+    ]"
     data="samplesVisible"
     order="description">
 </vn-crud-model>
@@ -31,7 +40,6 @@
                 ng-model="$ctrl.clientSample.typeFk"
                 model="ClientSample.typeFk"
                 data="samplesVisible"
-                fields="['id', 'description', 'model']"
                 show-field="description"
                 label="Sample"
                 required="true">

modules/client/front/sample/create/index.js

@@ -3,12 +3,13 @@ import Section from 'salix/components/section';
 import './style.scss';
 
 class Controller extends Section {
-    constructor($element, $) {
+    constructor($element, $, vnEmail) {
         super($element, $);
         this.clientSample = {
             clientFk: this.$params.id,
             companyId: this.vnConfig.companyFk
         };
+        this.vnEmail = vnEmail;
     }
 
     get client() {
@@ -36,9 +37,7 @@ class Controller extends Section {
 
     onSubmit() {
         this.$.watcher.check();
-        this.$.watcher.realSubmit().then(() =>
-            this.sendSample()
-        );
+        this.$.watcher.realSubmit().then(() => this.send());
     }
 
     // showPreview() {
@@ -93,16 +92,39 @@ class Controller extends Section {
     //     this.$http.get(query, {params}).then(cb);
     // }
 
+    validateParams(params) {
+        const sampleType = this.$.sampleType.selection;
+
+        if (!params.recipient)
+            return this.vnApp.showError(this.$t('Email cannot be blank'));
+
+        if (!sampleType)
+            return this.vnApp.showError(this.$t('Choose a sample'));
+
+        if (sampleType.hasCompany && !this.clientSample.companyFk)
+            return this.vnApp.showError(this.$t('Choose a company'));
+
+        if (sampleType.hasCompany)
+            params.companyId = this.clientSample.companyFk;
+
+        if (sampleType.datepickerEnabled && !this.clientSample.from)
+            return this.vnApp.showError(this.$t('Choose a date'));
+
+        if (sampleType.datepickerEnabled)
+            params.from = this.clientSample.from;
+    }
+
     preview() {
         const sampleType = this.$.sampleType.selection;
 
         const params = {
             recipientId: this.$params.id,
-            recipient: this.clientSample.recipient,
-            replyTo: this.clientSample.replyTo
+            recipient: this.clientSample.recipient
         };
 
-        const path = `${sampleType.model}/${this.$params.id}/${sampleType.property}Html`;
+        this.validateParams(params);
+
+        const path = `${sampleType.model}/${this.$params.id}/${sampleType.code}-html`;
         this.$http.get(path, {params})
             .then(response => {
                 this.$.showPreview.show();
@@ -116,10 +138,19 @@ class Controller extends Section {
     }
 
     send() {
-        this.vnEmail.send(`tickets/${this.id}/credit-request-email`, {
-            recipientId: this.ticket.client.id,
-            recipient: $data.email
-        });
+        const sampleType = this.$.sampleType.selection;
+
+        const params = {
+            recipientId: this.client.id,
+            recipient: this.clientSample.recipient,
+            replyTo: this.clientSample.replyTo
+        };
+
+        this.validateParams(params);
+
+        const path = `${sampleType.model}/${this.$params.id}/${sampleType.code}-email`;
+        this.vnEmail.send(path, params)
+            .then(() => this.$state.go('client.card.sample.index'));
     }
 
     getWorkerEmail() {
@@ -132,7 +163,7 @@ class Controller extends Section {
     }
 }
 
-Controller.$inject = ['$element', '$scope'];
+Controller.$inject = ['$element', '$scope', 'vnEmail'];
 
 ngModule.vnComponent('vnClientSampleCreate', {
     template: require('./index.html'),

modules/item/front/index/style.scss

@@ -21,12 +21,4 @@ vn-item-product {
     vn-label-value:first-of-type section{
         margin-top: 9px;
     }
-}
-
-table {
-    img {
-        border-radius: 50%;
-        width: 50px;
-        height: 50px;
-    }
 }

modules/route/back/methods/route/driverRouteEmail.js

@@ -0,0 +1,58 @@
+const {Email} = require('vn-print');
+
+module.exports = Self => {
+    Self.remoteMethodCtx('driverRouteEmail', {
+        description: 'Sends the driver route email with an attached PDF',
+        accepts: [
+            {
+                arg: 'id',
+                type: 'number',
+                required: true,
+                description: 'The client id',
+                http: {source: 'path'}
+            },
+            {
+                arg: 'recipient',
+                type: 'string',
+                description: 'The recipient email',
+                required: true,
+            },
+            {
+                arg: 'replyTo',
+                type: 'string',
+                description: 'The sender email to reply to',
+                required: false
+            },
+            {
+                arg: 'recipientId',
+                type: 'number',
+                description: 'The recipient id to send to the recipient preferred language',
+                required: false
+            }
+        ],
+        returns: {
+            type: ['object'],
+            root: true
+        },
+        http: {
+            path: '/:id/driver-route-email',
+            verb: 'POST'
+        }
+    });
+
+    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();
+    };
+};

modules/route/back/methods/route/driverRoutePdf.js

@@ -0,0 +1,55 @@
+const {Report} = require('vn-print');
+
+module.exports = Self => {
+    Self.remoteMethodCtx('driverRoutePdf', {
+        description: 'Returns the driver route pdf',
+        accepts: [
+            {
+                arg: 'id',
+                type: 'number',
+                required: true,
+                description: 'The client id',
+                http: {source: 'path'}
+            },
+            {
+                arg: 'recipientId',
+                type: 'number',
+                description: 'The recipient id',
+                required: false
+            }
+        ],
+        returns: [
+            {
+                arg: 'body',
+                type: 'file',
+                root: true
+            }, {
+                arg: 'Content-Type',
+                type: 'String',
+                http: {target: 'header'}
+            }, {
+                arg: 'Content-Disposition',
+                type: 'String',
+                http: {target: 'header'}
+            }
+        ],
+        http: {
+            path: '/:id/driver-route-pdf',
+            verb: 'GET'
+        }
+    });
+
+    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"`];
+    };
+};

modules/route/back/models/route.js

@@ -10,6 +10,8 @@ module.exports = Self => {
     require('../methods/route/getSuggestedTickets')(Self);
     require('../methods/route/unlink')(Self);
     require('../methods/route/updateWorkCenter')(Self);
+    require('../methods/route/driverRoutePdf')(Self);
+    require('../methods/route/driverRouteEmail')(Self);
 
     Self.validate('kmStart', validateDistance, {
         message: 'Distance must be lesser than 1000'

modules/route/front/agency-term/index/index.js

@@ -1,6 +1,5 @@
 import ngModule from '../../module';
 import Section from 'salix/components/section';
-import './style.scss';
 
 class Controller extends Section {
     constructor($element, $) {

modules/route/front/agency-term/index/style.scss

@@ -1,32 +0,0 @@
-@import "variables";
-
-vn-item-product {
-    display: block;
-
-    .id {
-        background-color: $color-main;
-        color: $color-font-dark;
-        margin-bottom: 0;
-    }
-    .image {
-        height: 112px;
-        width: 112px;
-
-        & > img {
-            max-height: 100%;
-            max-width: 100%;
-            border-radius: 3px;
-        }
-    }
-    vn-label-value:first-of-type section{
-        margin-top: 9px;
-    }
-}
-
-table {
-    img {
-        border-radius: 50%;
-        width: 50px;
-        height: 50px;
-    }
-}

modules/route/front/descriptor/index.js

@@ -11,16 +11,16 @@ class Controller extends Descriptor {
     }
 
     showRouteReport() {
-        this.vnReport.show('driver-route', {
-            routeId: this.id
+        this.vnReport.show(`Routes/${this.id}/driver-route-pdf`, {
+            id: this.id
         });
     }
 
     sendRouteReport() {
         const workerUser = this.route.worker.user;
-        this.vnEmail.send('driver-route', {
+        this.vnEmail.send(`Routes/${this.id}/driver-route-email`, {
             recipient: workerUser.emailUser.email,
-            routeId: this.id
+            id: this.id
         });
     }
 

modules/ticket/back/methods/ticket/deliveryNoteEmail.js

@@ -1,4 +1,4 @@
-const { Email } = require('vn-print');
+const {Email} = require('vn-print');
 
 module.exports = Self => {
     Self.remoteMethodCtx('deliveryNoteEmail', {
@@ -46,7 +46,7 @@ module.exports = Self => {
         }
     });
 
-    Self.deliveryNoteEmail = async(ctx, id) => { 
+    Self.deliveryNoteEmail = async ctx => {
         const args = Object.assign({}, ctx.args);
         const params = {
             recipient: args.recipient,

modules/ticket/back/methods/ticket/deliveryNotePdf.js

@@ -1,4 +1,4 @@
-const {Report, Email, smtp} = require('vn-print');
+const {Report} = require('vn-print');
 
 module.exports = Self => {
     Self.remoteMethodCtx('deliveryNotePdf', {
@@ -45,7 +45,7 @@ module.exports = Self => {
         }
     });
 
-    Self.deliveryNotePdf = async(ctx, id) => { 
+    Self.deliveryNotePdf = async(ctx, id) => {
         const args = Object.assign({}, ctx.args);
         const params = {lang: ctx.req.getLocale()};
 

print/core/components/attachment/assets/css/import.js

@@ -1,9 +1,12 @@
-const Stylesheet = require(`${appPath}/core/stylesheet`);
+const Stylesheet = require(`vn-print/core/stylesheet`);
+
+const path = require('path');
+const vnPrintPath = path.resolve('print');
 
 module.exports = new Stylesheet([
-    `${appPath}/common/css/spacing.css`,
-    `${appPath}/common/css/misc.css`,
-    `${appPath}/common/css/layout.css`,
-    `${appPath}/common/css/email.css`,
+    `${vnPrintPath}/common/css/spacing.css`,
+    `${vnPrintPath}/common/css/misc.css`,
+    `${vnPrintPath}/common/css/layout.css`,
+    `${vnPrintPath}/common/css/email.css`,
     `${__dirname}/style.css`])
     .mergeStyles();

print/templates/email/claim-pickup-order/assets/css/import.js

@@ -8,4 +8,5 @@ module.exports = new Stylesheet([
     `${vnPrintPath}/common/css/misc.css`,
     `${vnPrintPath}/common/css/layout.css`,
     `${vnPrintPath}/common/css/email.css`])
-    .mergeStyles();
+    .mergeStyles();
+

print/templates/email/client-debt-statement/assets/css/import.js

@@ -8,4 +8,4 @@ module.exports = new Stylesheet([
     `${vnPrintPath}/common/css/misc.css`,
     `${vnPrintPath}/common/css/layout.css`,
     `${vnPrintPath}/common/css/email.css`])
-    .mergeStyles();
+    .mergeStyles();

print/templates/email/client-welcome/assets/css/import.js

@@ -1,8 +1,11 @@
-const Stylesheet = require(`${appPath}/core/stylesheet`);
+const Stylesheet = require(`vn-print/core/stylesheet`);
+
+const path = require('path');
+const vnPrintPath = path.resolve('print');
 
 module.exports = new Stylesheet([
-    `${appPath}/common/css/spacing.css`,
-    `${appPath}/common/css/misc.css`,
-    `${appPath}/common/css/layout.css`,
-    `${appPath}/common/css/email.css`])
+    `${vnPrintPath}/common/css/spacing.css`,
+    `${vnPrintPath}/common/css/misc.css`,
+    `${vnPrintPath}/common/css/layout.css`,
+    `${vnPrintPath}/common/css/email.css`])
     .mergeStyles();

print/templates/email/client-welcome/client-welcome.js

@@ -1,15 +1,15 @@
-const Component = require(`${appPath}/core/component`);
+const Component = require(`vn-print/core/component`);
 const emailHeader = new Component('email-header');
 const emailFooter = new Component('email-footer');
 
 module.exports = {
     name: 'client-welcome',
     async serverPrefetch() {
-        this.client = await this.fetchClient(this.recipientId);
+        this.client = await this.fetchClient(this.id);
     },
     methods: {
-        fetchClient(clientId) {
-            return this.findOneFromDef('client', [clientId]);
+        fetchClient(id) {
+            return this.findOneFromDef('client', [id]);
         },
     },
     components: {
@@ -17,7 +17,7 @@ module.exports = {
         'email-footer': emailFooter.build()
     },
     props: {
-        recipientId: {
+        id: {
             type: [Number, String],
             required: true
         }

print/templates/email/delivery-note-link/assets/css/import.js

@@ -1,9 +1,12 @@
-const Stylesheet = require(`${appPath}/core/stylesheet`);
+const Stylesheet = require(`vn-print/core/stylesheet`);
+
+const path = require('path');
+const vnPrintPath = path.resolve('print');
 
 module.exports = new Stylesheet([
-    `${appPath}/common/css/spacing.css`,
-    `${appPath}/common/css/misc.css`,
-    `${appPath}/common/css/layout.css`,
-    `${appPath}/common/css/email.css`,
+    `${vnPrintPath}/common/css/spacing.css`,
+    `${vnPrintPath}/common/css/misc.css`,
+    `${vnPrintPath}/common/css/layout.css`,
+    `${vnPrintPath}/common/css/email.css`,
     `${__dirname}/style.css`])
     .mergeStyles();

print/templates/email/delivery-note-link/delivery-note-link.js

@@ -1,4 +1,4 @@
-const Component = require(`${appPath}/core/component`);
+const Component = require(`vn-print/core/component`);
 const emailHeader = new Component('email-header');
 const emailFooter = new Component('email-footer');
 
@@ -9,7 +9,7 @@ module.exports = {
         'email-footer': emailFooter.build()
     },
     props: {
-        ticketId: {
+        id: {
             type: [Number, String],
             required: true
         }

print/templates/email/delivery-note/assets/css/import.js

@@ -8,4 +8,4 @@ module.exports = new Stylesheet([
     `${vnPrintPath}/common/css/misc.css`,
     `${vnPrintPath}/common/css/layout.css`,
     `${vnPrintPath}/common/css/email.css`])
-    .mergeStyles();
+    .mergeStyles();

print/templates/email/driver-route/assets/css/import.js

@@ -1,8 +1,11 @@
-const Stylesheet = require(`${appPath}/core/stylesheet`);
+const Stylesheet = require(`vn-print/core/stylesheet`);
+
+const path = require('path');
+const vnPrintPath = path.resolve('print');
 
 module.exports = new Stylesheet([
-    `${appPath}/common/css/spacing.css`,
-    `${appPath}/common/css/misc.css`,
-    `${appPath}/common/css/layout.css`,
-    `${appPath}/common/css/email.css`])
+    `${vnPrintPath}/common/css/spacing.css`,
+    `${vnPrintPath}/common/css/misc.css`,
+    `${vnPrintPath}/common/css/layout.css`,
+    `${vnPrintPath}/common/css/email.css`])
     .mergeStyles();

print/templates/email/driver-route/driver-route.js

@@ -1,4 +1,4 @@
-const Component = require(`${appPath}/core/component`);
+const Component = require(`vn-print/core/component`);
 const emailHeader = new Component('email-header');
 const emailFooter = new Component('email-footer');
 
@@ -9,7 +9,7 @@ module.exports = {
         'email-footer': emailFooter.build()
     },
     props: {
-        routeId: {
+        id: {
             type: [Number, String],
             required: true
         }

print/templates/email/incoterms-authorization/assets/css/import.js

@@ -1,8 +1,11 @@
-const Stylesheet = require(`${appPath}/core/stylesheet`);
+const Stylesheet = require(`vn-print/core/stylesheet`);
+
+const path = require('path');
+const vnPrintPath = path.resolve('print');
 
 module.exports = new Stylesheet([
-    `${appPath}/common/css/spacing.css`,
-    `${appPath}/common/css/misc.css`,
-    `${appPath}/common/css/layout.css`,
-    `${appPath}/common/css/email.css`])
+    `${vnPrintPath}/common/css/spacing.css`,
+    `${vnPrintPath}/common/css/misc.css`,
+    `${vnPrintPath}/common/css/layout.css`,
+    `${vnPrintPath}/common/css/email.css`])
     .mergeStyles();

print/templates/email/incoterms-authorization/incoterms-authorization.js

@@ -1,4 +1,4 @@
-const Component = require(`${appPath}/core/component`);
+const Component = require(`vn-report/core/component`);
 const emailHeader = new Component('email-header');
 const emailFooter = new Component('email-footer');
 const attachment = new Component('attachment');
@@ -15,7 +15,7 @@ module.exports = {
         'attachment': attachment.build()
     },
     props: {
-        recipientId: {
+        id: {
             type: [Number, String],
             required: true
         },

print/templates/email/letter-debtor-nd/assets/css/import.js

@@ -1,9 +1,12 @@
-const Stylesheet = require(`${appPath}/core/stylesheet`);
+const Stylesheet = require(`vn-print/core/stylesheet`);
+
+const path = require('path');
+const vnPrintPath = path.resolve('print');
 
 module.exports = new Stylesheet([
-    `${appPath}/common/css/spacing.css`,
-    `${appPath}/common/css/misc.css`,
-    `${appPath}/common/css/layout.css`,
-    `${appPath}/common/css/email.css`])
+    `${vnPrintPath}/common/css/spacing.css`,
+    `${vnPrintPath}/common/css/misc.css`,
+    `${vnPrintPath}/common/css/layout.css`,
+    `${vnPrintPath}/common/css/email.css`])
     .mergeStyles();
 

print/templates/email/letter-debtor-nd/letter-debtor-nd.js

@@ -1,4 +1,4 @@
-const Component = require(`${appPath}/core/component`);
+const Component = require(`vn-print/core/component`);
 const emailHeader = new Component('email-header');
 const emailFooter = new Component('email-footer');
 const attachment = new Component('attachment');
@@ -7,7 +7,7 @@ const attachments = require('./attachments.json');
 module.exports = {
     name: 'letter-debtor-nd',
     async serverPrefetch() {
-        this.debtor = await this.fetchDebtor(this.recipientId, this.companyId);
+        this.debtor = await this.fetchDebtor(this.id, this.companyId);
 
         if (!this.debtor)
             throw new Error('Something went wrong');
@@ -16,8 +16,8 @@ module.exports = {
         return {attachments};
     },
     methods: {
-        fetchDebtor(clientId, companyId) {
-            return this.findOneFromDef('client', [clientId, companyId]);
+        fetchDebtor(id, companyId) {
+            return this.findOneFromDef('client', [id, companyId]);
         }
     },
     components: {
@@ -26,10 +26,7 @@ module.exports = {
         'attachment': attachment.build()
     },
     props: {
-        authorization: {
-            required: true
-        },
-        recipientId: {
+        id: {
             type: [Number, String],
             required: true
         },

print/templates/email/letter-debtor-nd/sql/client.sql

@@ -5,7 +5,6 @@ SELECT
     be.name AS bankName
 FROM client c
     JOIN company AS cny 
-      JOIN supplierAccount AS sa ON
-        IF (ct.code = 'PT',  sa.id = 907,  sa.id = cny.supplierAccountFk)
+      JOIN supplierAccount AS sa ON sa.id = cny.supplierAccountFk
     JOIN bankEntity be ON be.id = sa.bankEntityFk
 WHERE c.id = ? AND cny.id = ?

print/templates/email/letter-debtor-st/assets/css/import.js

@@ -1,9 +1,12 @@
-const Stylesheet = require(`${appPath}/core/stylesheet`);
+const Stylesheet = require(`vn-print/core/stylesheet`);
+
+const path = require('path');
+const vnPrintPath = path.resolve('print');
 
 module.exports = new Stylesheet([
-    `${appPath}/common/css/spacing.css`,
-    `${appPath}/common/css/misc.css`,
-    `${appPath}/common/css/layout.css`,
-    `${appPath}/common/css/email.css`])
+    `${vnPrintPath}/common/css/spacing.css`,
+    `${vnPrintPath}/common/css/misc.css`,
+    `${vnPrintPath}/common/css/layout.css`,
+    `${vnPrintPath}/common/css/email.css`])
     .mergeStyles();
 

print/templates/email/letter-debtor-st/letter-debtor-st.js

@@ -1,4 +1,4 @@
-const Component = require(`${appPath}/core/component`);
+const Component = require(`vn-print/core/component`);
 const emailHeader = new Component('email-header');
 const emailFooter = new Component('email-footer');
 const attachment = new Component('attachment');
@@ -7,7 +7,7 @@ const attachments = require('./attachments.json');
 module.exports = {
     name: 'letter-debtor-st',
     async serverPrefetch() {
-        this.debtor = await this.fetchDebtor(this.recipientId, this.companyId);
+        this.debtor = await this.fetchDebtor(this.id, this.companyId);
 
         if (!this.debtor)
             throw new Error('Something went wrong');
@@ -16,8 +16,8 @@ module.exports = {
         return {attachments};
     },
     methods: {
-        fetchDebtor(clientId, companyId) {
-            return this.findOneFromDef('client', [clientId, companyId]);
+        fetchDebtor(id, companyId) {
+            return this.findOneFromDef('client', [id, companyId]);
         }
     },
     components: {
@@ -26,7 +26,7 @@ module.exports = {
         'attachment': attachment.build()
     },
     props: {
-        recipientId: {
+        id: {
             type: [Number, String],
             required: true
         },

print/templates/email/letter-debtor-st/sql/client.sql

@@ -5,7 +5,6 @@ SELECT
     be.name AS bankName
 FROM client c
     JOIN company AS cny 
-      JOIN supplierAccount AS sa ON
-        IF (ct.code = 'PT',  sa.id = 907,  sa.id = cny.supplierAccountFk)
+      JOIN supplierAccount AS sa ON sa.id = cny.supplierAccountFk
     JOIN bankEntity be ON be.id = sa.bankEntityFk
 WHERE c.id = ? AND cny.id = ?

print/templates/email/printer-setup/assets/css/import.js

@@ -1,8 +1,11 @@
-const Stylesheet = require(`${appPath}/core/stylesheet`);
+const Stylesheet = require(`vn-print/core/stylesheet`);
+
+const path = require('path');
+const vnPrintPath = path.resolve('print');
 
 module.exports = new Stylesheet([
-    `${appPath}/common/css/spacing.css`,
-    `${appPath}/common/css/misc.css`,
-    `${appPath}/common/css/layout.css`,
-    `${appPath}/common/css/email.css`])
+    `${vnPrintPath}/common/css/spacing.css`,
+    `${vnPrintPath}/common/css/misc.css`,
+    `${vnPrintPath}/common/css/layout.css`,
+    `${vnPrintPath}/common/css/email.css`])
     .mergeStyles();

print/templates/email/printer-setup/printer-setup.js

@@ -1,4 +1,4 @@
-const Component = require(`${appPath}/core/component`);
+const Component = require(`vn-print/core/component`);
 const emailHeader = new Component('email-header');
 const emailFooter = new Component('email-footer');
 const attachment = new Component('attachment');
@@ -7,14 +7,14 @@ const attachments = require('./attachments.json');
 module.exports = {
     name: 'printer-setup',
     async serverPrefetch() {
-        this.client = await this.fetchClient(this.recipientId);
+        this.client = await this.fetchClient(this.id);
     },
     data() {
         return {attachments};
     },
     methods: {
-        fetchClient(clientId) {
-            return this.findOneFromDef('client', [clientId]);
+        fetchClient(id) {
+            return this.findOneFromDef('client', [id]);
         }
     },
     components: {
@@ -23,7 +23,7 @@ module.exports = {
         'attachment': attachment.build()
     },
     props: {
-        recipientId: {
+        id: {
             type: [Number, String],
             required: true
         }

print/templates/email/sepa-core/assets/css/import.js

@@ -1,8 +1,12 @@
-const Stylesheet = require(`${appPath}/core/stylesheet`);
+const Stylesheet = require(`vn-print/core/stylesheet`);
+
+const path = require('path');
+const vnPrintPath = path.resolve('print');
 
 module.exports = new Stylesheet([
-    `${appPath}/common/css/spacing.css`,
-    `${appPath}/common/css/misc.css`,
-    `${appPath}/common/css/layout.css`,
-    `${appPath}/common/css/email.css`])
+    `${vnPrintPath}/common/css/spacing.css`,
+    `${vnPrintPath}/common/css/misc.css`,
+    `${vnPrintPath}/common/css/layout.css`,
+    `${vnPrintPath}/common/css/email.css`])
     .mergeStyles();
+

print/templates/email/sepa-core/sepa-core.js

@@ -1,4 +1,4 @@
-const Component = require(`${appPath}/core/component`);
+const Component = require(`vn-print/core/component`);
 const emailHeader = new Component('email-header');
 const emailFooter = new Component('email-footer');
 const attachment = new Component('attachment');
@@ -15,7 +15,7 @@ module.exports = {
         'attachment': attachment.build()
     },
     props: {
-        recipientId: {
+        id: {
             type: [Number, String],
             required: true
         },

print/templates/reports/driver-route/assets/css/import.js

@@ -1,9 +1,12 @@
-const Stylesheet = require(`${appPath}/core/stylesheet`);
+const Stylesheet = require(`vn-print/core/stylesheet`);
+
+const path = require('path');
+const vnPrintPath = path.resolve('print');
 
 module.exports = new Stylesheet([
-    `${appPath}/common/css/spacing.css`,
-    `${appPath}/common/css/misc.css`,
-    `${appPath}/common/css/layout.css`,
-    `${appPath}/common/css/report.css`,
+    `${vnPrintPath}/common/css/spacing.css`,
+    `${vnPrintPath}/common/css/misc.css`,
+    `${vnPrintPath}/common/css/layout.css`,
+    `${vnPrintPath}/common/css/report.css`,
     `${__dirname}/style.css`])
     .mergeStyles();

print/templates/reports/driver-route/driver-route.html

@@ -141,7 +141,7 @@
                                             </tr>
                                         </tbody>
                                     </table>
-                                    <div v-if="ticket.description class="text-area">
+                                    <div v-if="ticket.description" class="text-area">
                                         <p>{{ticket.description}}</p>
                                     </div>
                                 </div>

print/templates/reports/driver-route/driver-route.js

@@ -1,13 +1,18 @@
-const Component = require(`${appPath}/core/component`);
+const Component = require(`vn-print/core/component`);
 const reportHeader = new Component('report-header');
 const reportFooter = new Component('report-footer');
 
 module.exports = {
     name: 'driver-route',
     async serverPrefetch() {
-        const routesId = this.routeId.split(',');
-        const routes = await this.fetchRoutes(routesId);
-        const tickets = await this.fetchTickets(routesId);
+        let ids = this.id;
+
+        const hasMultipleRoutes = String(this.id).includes(',');
+        if (hasMultipleRoutes)
+            ids = this.id.split(',');
+
+        const routes = await this.fetchRoutes(ids);
+        const tickets = await this.fetchTickets(ids);
 
         const map = new Map();
 
@@ -26,11 +31,11 @@ module.exports = {
             throw new Error('Something went wrong');
     },
     methods: {
-        fetchRoutes(routesId) {
-            return this.rawSqlFromDef('routes', [routesId]);
+        fetchRoutes(ids) {
+            return this.rawSqlFromDef('routes', [ids]);
         },
-        fetchTickets(routesId) {
-            return this.rawSqlFromDef('tickets', [routesId, routesId]);
+        fetchTickets(ids) {
+            return this.rawSqlFromDef('tickets', [ids, ids]);
         }
     },
     components: {
@@ -38,7 +43,7 @@ module.exports = {
         'report-footer': reportFooter.build()
     },
     props: {
-        routeId: {
+        id: {
             type: [Number, String],
             required: true
         }

print/templates/reports/incoterms-authorization/assets/css/import.js

@@ -1,8 +1,12 @@
-const Stylesheet = require(`${appPath}/core/stylesheet`);
+const Stylesheet = require(`vn-print/core/stylesheet`);
+
+const path = require('path');
+const vnPrintPath = path.resolve('print');
 
 module.exports = new Stylesheet([
-    `${appPath}/common/css/layout.css`,
-    `${appPath}/common/css/report.css`,
-    `${appPath}/common/css/misc.css`,
+    `${vnPrintPath}/common/css/spacing.css`,
+    `${vnPrintPath}/common/css/misc.css`,
+    `${vnPrintPath}/common/css/layout.css`,
+    `${vnPrintPath}/common/css/report.css`,
     `${__dirname}/style.css`])
     .mergeStyles();

print/templates/reports/incoterms-authorization/incoterms-authorization.js

@@ -1,11 +1,11 @@
-const Component = require(`${appPath}/core/component`);
+const Component = require(`vn-print/core/component`);
 const reportHeader = new Component('report-header');
 const reportFooter = new Component('report-footer');
 
 module.exports = {
     name: 'incoterms-authorization',
     async serverPrefetch() {
-        this.client = await this.findOneFromDef('client', [this.recipientId]);
+        this.client = await this.findOneFromDef('client', [this.id]);
         this.company = await this.findOneFromDef('company', [this.companyId]);
         if (!this.client)
             throw new Error('Something went wrong');
@@ -20,7 +20,7 @@ module.exports = {
         'report-footer': reportFooter.build()
     },
     props: {
-        recipientId: {
+        id: {
             type: [Number, String],
             required: true
         },

print/templates/reports/letter-debtor/assets/css/import.js

@@ -1,9 +1,12 @@
-const Stylesheet = require(`${appPath}/core/stylesheet`);
+const Stylesheet = require(`vn-print/core/stylesheet`);
+
+const path = require('path');
+const vnPrintPath = path.resolve('print');
 
 module.exports = new Stylesheet([
-    `${appPath}/common/css/spacing.css`,
-    `${appPath}/common/css/misc.css`,
-    `${appPath}/common/css/layout.css`,
-    `${appPath}/common/css/report.css`,
+    `${vnPrintPath}/common/css/spacing.css`,
+    `${vnPrintPath}/common/css/misc.css`,
+    `${vnPrintPath}/common/css/layout.css`,
+    `${vnPrintPath}/common/css/report.css`,
     `${__dirname}/style.css`])
     .mergeStyles();

print/templates/reports/letter-debtor/letter-debtor.js

@@ -1,12 +1,12 @@
-const Component = require(`${appPath}/core/component`);
+const Component = require(`vn-print/core/component`);
 const reportHeader = new Component('report-header');
 const reportFooter = new Component('report-footer');
 
 module.exports = {
     name: 'letter-debtor',
     async serverPrefetch() {
-        this.client = await this.fetchClient(this.recipientId);
-        this.sales = await this.fetchSales(this.recipientId, this.companyId);
+        this.client = await this.fetchClient(this.id);
+        this.sales = await this.fetchSales(this.id, this.companyId);
 
         if (!this.client)
             throw new Error('Something went wrong');
@@ -22,12 +22,12 @@ module.exports = {
         return {totalBalance: 0.00};
     },
     methods: {
-        fetchClient(clientId) {
-            return this.findOneFromDef('client', [clientId]);
+        fetchClient(id) {
+            return this.findOneFromDef('client', [id]);
         },
-        fetchSales(clientId, companyId) {
+        fetchSales(id, companyId) {
             return this.findOneFromDef('sales', [
-                clientId,
+                id,
                 companyId
             ]);
         },
@@ -62,7 +62,7 @@ module.exports = {
         'report-footer': reportFooter.build()
     },
     props: {
-        recipientId: {
+        id: {
             type: [Number, String],
             required: true
         },

print/templates/reports/sepa-core/assets/css/import.js

@@ -1,9 +1,12 @@
-const Stylesheet = require(`${appPath}/core/stylesheet`);
+const Stylesheet = require(`vn-print/core/stylesheet`);
+
+const path = require('path');
+const vnPrintPath = path.resolve('print');
 
 module.exports = new Stylesheet([
-    `${appPath}/common/css/spacing.css`,
-    `${appPath}/common/css/misc.css`,
-    `${appPath}/common/css/layout.css`,
-    `${appPath}/common/css/report.css`,
+    `${vnPrintPath}/common/css/spacing.css`,
+    `${vnPrintPath}/common/css/misc.css`,
+    `${vnPrintPath}/common/css/layout.css`,
+    `${vnPrintPath}/common/css/report.css`,
     `${__dirname}/style.css`])
     .mergeStyles();

print/templates/reports/sepa-core/sepa-core.js

@@ -1,12 +1,12 @@
-const Component = require(`${appPath}/core/component`);
+const Component = require(`vn-print/core/component`);
 const reportHeader = new Component('report-header');
 const reportFooter = new Component('report-footer');
 
 const rptSepaCore = {
     name: 'sepa-core',
     async serverPrefetch() {
-        this.client = await this.fetchClient(this.recipientId, this.companyId);
-        this.supplier = await this.fetchSupplier(this.recipientId, this.companyId);
+        this.client = await this.fetchClient(this.id, this.companyId);
+        this.supplier = await this.fetchSupplier(this.id, this.companyId);
 
         if (!this.client)
             throw new Error('Something went wrong');
@@ -19,18 +19,18 @@ const rptSepaCore = {
         }
     },
     methods: {
-        fetchClient(clientId, companyId) {
+        fetchClient(id, companyId) {
             return this.findOneFromDef('client', [
                 companyId,
                 companyId,
-                clientId
+                id
             ]);
         },
-        fetchSupplier(clientId, companyId) {
+        fetchSupplier(id, companyId) {
             return this.findOneFromDef('supplier', [
                 companyId,
                 companyId,
-                clientId
+                id
             ]);
         }
     },
@@ -39,7 +39,7 @@ const rptSepaCore = {
         'report-footer': reportFooter.build()
     },
     props: {
-        recipientId: {
+        id: {
             type: [Number, String],
             required: true
         },