Merge branch 'dev' into 2457-fix_regularizeClaim_unit_test

modules/invoiceOut/front/locale/es.yml

@@ -1,3 +1,2 @@
-Invoice out: Facturas
+InvoiceOut: Facturas
-invoiceOut: factura
 Search invoices by reference: Buscar facturas por referencia

modules/invoiceOut/front/routes.json

@@ -22,7 +22,7 @@
             "url": "/index?q",
             "state": "invoiceOut.index",
             "component": "vn-invoice-out-index",
-            "description": "Invoice out"
+            "description": "InvoiceOut"
         },
         {
             "url": "/summary",

print/core/component.js

@@ -93,10 +93,11 @@ class Component {
 
         const component = this.build();
         const i18n = new VueI18n(config.i18n);
+        const props = {tplPath: this.path, ...this.args};
         this._component = new Vue({
             i18n: i18n,
             render: h => h(component, {
-                props: this.args
+                props: props
             })
         });
 

print/core/database.js

@@ -1,5 +1,6 @@
 const mysql = require('mysql2/promise');
 const config = require('./config.js');
+const fs = require('fs-extra');
 
 module.exports = {
     init() {
@@ -10,6 +11,7 @@ module.exports = {
             });
         }
     },
+
     /**
      * Makes a query from a raw sql
      * @param {String} query - The raw SQL query
@@ -22,6 +24,20 @@ module.exports = {
             return rows;
         });
     },
+
+    /**
+     * Makes a query from a SQL file
+     * @param {String} queryName - The SQL file name
+     * @param {Object} params - Parameterized values
+     *
+     * @return {Object} - Result promise
+     */
+    rawSqlFromDef(queryName, params) {
+        const query = fs.readFileSync(`${queryName}.sql`, 'utf8');
+
+        return this.rawSql(query, params);
+    },
+
     /**
      * Returns the first row from a given raw sql
      * @param {String} query - The raw SQL query
@@ -32,6 +48,19 @@ module.exports = {
     findOne(query, params) {
         return this.rawSql(query, params).then(([row]) => row);
     },
+
+    /**
+     * Returns the first row from a given SQL file
+     * @param {String} queryName - The SQL file name
+     * @param {Object} params - Parameterized values
+     *
+     * @return {Object} - Result promise
+     */
+    findOneFromDef(queryName, params) {
+        return this.rawSqlFromDef(queryName, params)
+            .then(([row]) => row);
+    },
+
     /**
      * Returns the first property from a given raw sql
      * @param {String} query - The raw SQL query
@@ -44,7 +73,17 @@ module.exports = {
             return Object.values(row)[0];
         });
     },
-    findFromDef() {
 
+    /**
+     * Returns the first property from a given SQL file
+     * @param {String} queryName - The SQL file name
+     * @param {Object} params - Parameterized values
+     *
+     * @return {Object} - Result promise
+     */
+    findValueFromDef(queryName, params) {
+        return this.findOneFromDef(queryName, params).then(row => {
+            return Object.values(row)[0];
+        });
     }
 };

print/core/mixins/db-helper.js

@@ -0,0 +1,74 @@
+const Vue = require('vue');
+const path = require('path');
+const db = require('../database');
+
+const dbHelper = {
+    methods: {
+        /**
+         * Makes a query from a raw sql
+         * @param {String} query - The raw SQL query
+         * @param {Object} params - Parameterized values
+         *
+         * @return {Object} - Result promise
+         */
+        rawSql: db.rawSql,
+
+        /**
+         * Makes a query from a SQL file
+         * @param {String} queryName - The SQL file name
+         * @param {Object} params - Parameterized values
+         *
+         * @return {Object} - Result promise
+         */
+        rawSqlFromDef(queryName, params) {
+            const absolutePath = path.join(__dirname, '../', this.tplPath, 'sql', queryName);
+            return db.rawSqlFromDef(absolutePath, params);
+        },
+
+        /**
+         * Returns the first row from a given raw sql
+         * @param {String} query - The raw SQL query
+         * @param {Object} params - Parameterized values
+         *
+         * @return {Object} - Result promise
+         */
+        findOne: db.findOne,
+
+        /**
+         * Returns the first row from a given SQL file
+         * @param {String} queryName - The SQL file name
+         * @param {Object} params - Parameterized values
+         *
+         * @return {Object} - Result promise
+         */
+        findOneFromDef(queryName, params) {
+            return this.rawSqlFromDef(queryName, params)
+                .then(([row]) => row);
+        },
+
+        /**
+         * Returns the first property from a given raw sql
+         * @param {String} query - The raw SQL query
+         * @param {Object} params - Parameterized values
+         *
+         * @return {Object} - Result promise
+         */
+        findValue: db.findValue,
+
+        /**
+         * Returns the first property from a given SQL file
+         * @param {String} queryName - The SQL file name
+         * @param {Object} params - Parameterized values
+         *
+         * @return {Object} - Result promise
+         */
+        findValueFromDef(queryName, params) {
+            return this.findOneFromDef(queryName, params).then(row => {
+                return Object.values(row)[0];
+            });
+        }
+    },
+    props: ['tplPath']
+};
+
+Vue.mixin(dbHelper);

print/core/mixins/index.js

@@ -2,3 +2,4 @@
 require('./image-src');
 require('./user-locale');
 require('./prop-validator');
+require('./db-helper');

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

@@ -1,5 +1,4 @@
 const Component = require(`${appPath}/core/component`);
-const db = require(`${appPath}/core/database`);
 const emailHeader = new Component('email-header');
 const emailFooter = new Component('email-footer');
 
@@ -10,18 +9,7 @@ module.exports = {
     },
     methods: {
         fetchClient(clientId) {
-            return db.findOne(`
+            return this.findOneFromDef('client', [clientId]);
-                SELECT
-                    c.id,
-                    u.name AS userName,
-                    CONCAT(w.lastName, ' ', w.firstName) salesPersonName,
-                    w.phone AS salesPersonPhone,
-                    CONCAT(wu.name, '@verdnatura.es') AS salesPersonEmail
-                FROM client c
-                    JOIN account.user u ON u.id = c.id
-                    LEFT JOIN worker w ON w.id = c.salesPersonFk
-                    LEFT JOIN account.user wu ON wu.id = w.userFk
-                WHERE c.id = ?`, [clientId]);
         },
     },
     components: {

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

@@ -0,0 +1,11 @@
+SELECT
+    c.id,
+    u.name AS userName,
+    CONCAT(w.lastName, ' ', w.firstName) salesPersonName,
+    w.phone AS salesPersonPhone,
+    CONCAT(wu.name, '@verdnatura.es') AS salesPersonEmail
+FROM client c
+    JOIN account.user u ON u.id = c.id
+    LEFT JOIN worker w ON w.id = c.salesPersonFk
+    LEFT JOIN account.user wu ON wu.id = w.userFk
+WHERE c.id = ?

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

@@ -1,5 +1,4 @@
 const Component = require(`${appPath}/core/component`);
-const db = require(`${appPath}/core/database`);
 const emailHeader = new Component('email-header');
 const emailFooter = new Component('email-footer');
 const attachment = new Component('attachment');
@@ -18,17 +17,7 @@ module.exports = {
     },
     methods: {
         fetchDebtor(clientId, companyId) {
-            return db.findOne(`
+            return this.findOneFromDef('client', [clientId, companyId]);
-                SELECT
-                    c.dueDay,
-                    c.iban,
-                    sa.iban,
-                    be.name AS bankName
-                FROM client c
-                    JOIN company AS cny 
-                    JOIN supplierAccount AS sa ON sa.id = cny.supplierAccountFk 
-                    JOIN bankEntity be ON be.id = sa.bankEntityFk
-                WHERE c.id = ? AND cny.id = ?`, [clientId, companyId]);
         }
     },
     components: {

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

@@ -0,0 +1,10 @@
+SELECT
+    c.dueDay,
+    c.iban,
+    sa.iban,
+    be.name AS bankName
+FROM client c
+    JOIN company AS cny 
+    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/letter-debtor-st.js

@@ -18,17 +18,7 @@ module.exports = {
     },
     methods: {
         fetchDebtor(clientId, companyId) {
-            return db.findOne(`
+            return this.findOneFromDef('client', [clientId, companyId]);
-                SELECT
-                    c.dueDay,
-                    c.iban,
-                    sa.iban,
-                    be.name AS bankName
-                FROM client c
-                    JOIN company AS cny 
-                    JOIN supplierAccount AS sa ON sa.id = cny.supplierAccountFk 
-                    JOIN bankEntity be ON be.id = sa.bankEntityFk
-                WHERE c.id = ? AND cny.id = ?`, [clientId, companyId]);
         }
     },
     components: {

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

@@ -0,0 +1,10 @@
+SELECT
+    c.dueDay,
+    c.iban,
+    sa.iban,
+    be.name AS bankName
+FROM client c
+    JOIN company AS cny 
+    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/payment-update/payment-update.js

@@ -1,5 +1,4 @@
 const Component = require(`${appPath}/core/component`);
-const db = require(`${appPath}/core/database`);
 const emailHeader = new Component('email-header');
 const emailFooter = new Component('email-footer');
 
@@ -18,15 +17,7 @@ module.exports = {
     },
     methods: {
         fetchPayMethod(clientId) {
-            return db.findOne(
+            return this.findOneFromDef('payMethod', {clientId: clientId});
-                `SELECT
-                    c.dueDay,
-                    c.iban,
-                    pm.name,
-                    pm.code
-                FROM client c
-                    JOIN payMethod pm ON pm.id = c.payMethodFk
-                WHERE c.id = :clientId`, {clientId: clientId});
         }
     },
     components: {

print/templates/email/payment-update/sql/payMethod.sql

@@ -0,0 +1,8 @@
+SELECT
+    c.dueDay,
+    c.iban,
+    pm.name,
+    pm.code
+FROM client c
+    JOIN payMethod pm ON pm.id = c.payMethodFk
+WHERE c.id = :clientId

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

@@ -1,5 +1,4 @@
 const Component = require(`${appPath}/core/component`);
-const db = require(`${appPath}/core/database`);
 const emailHeader = new Component('email-header');
 const emailFooter = new Component('email-footer');
 const attachment = new Component('attachment');
@@ -15,20 +14,7 @@ module.exports = {
     },
     methods: {
         fetchClient(clientId) {
-            return db.findOne(`
+            return this.findOneFromDef('client', [clientId]);
-                SELECT
-                    c.id,
-                    u.lang locale,
-                    u.name AS userName,
-                    c.email recipient,
-                    CONCAT(w.lastName, ' ', w.firstName) salesPersonName,
-                    w.phone AS salesPersonPhone,
-                    CONCAT(wu.name, '@verdnatura.es') AS salesPersonEmail
-                FROM client c
-                    JOIN account.user u ON u.id = c.id
-                    LEFT JOIN worker w ON w.id = c.salesPersonFk
-                    LEFT JOIN account.user wu ON wu.id = w.userFk
-                WHERE c.id = ?`, [clientId]);
         }
     },
     components: {

print/templates/email/printer-setup/sql/client.sql

@@ -0,0 +1,12 @@
+SELECT
+    c.id,
+    u.name AS userName,
+    c.email recipient,
+    CONCAT(w.lastName, ' ', w.firstName) salesPersonName,
+    w.phone AS salesPersonPhone,
+    CONCAT(wu.name, '@verdnatura.es') AS salesPersonEmail
+FROM client c
+    JOIN account.user u ON u.id = c.id
+    LEFT JOIN worker w ON w.id = c.salesPersonFk
+    LEFT JOIN account.user wu ON wu.id = w.userFk
+WHERE c.id = ?

print/templates/reports/campaign-metrics/campaign-metrics.js

@@ -1,5 +1,4 @@
 const Component = require(`${appPath}/core/component`);
-const db = require(`${appPath}/core/database`);
 const reportHeader = new Component('report-header');
 const reportFooter = new Component('report-footer');
 
@@ -14,44 +13,10 @@ module.exports = {
     },
     methods: {
         fetchClient(clientId) {
-            return db.findOne(
+            return this.findOneFromDef('client', [clientId]);
-                `SELECT
-                    c.street,
-                    c.socialName,
-                    c.city,
-                    c.postcode,
-                    c.id,
-                    c.name AS clientName,
-                    p.name AS province,
-                    co.country                    
-                FROM client c
-                    JOIN province p ON c.provinceFk = p.id
-                    JOIN country co ON c.countryFk = co.id
-                WHERE
-                    c.id = ?`, [clientId]);
         },
         fetchSales(clientId, from, to) {
-            return db.rawSql(
+            return this.rawSqlFromDef('sales', [clientId, from, to]);
-                `SELECT
-                    SUM(s.quantity) AS subtotal,
-                    s.itemFk,
-                    s.concept,
-                    i.subName,
-                    i.tag5,
-                    i.value5,
-                    i.tag6,
-                    i.value6,
-                    i.tag7,
-                    i.value7
-                FROM sale s
-                    JOIN ticket t ON t.id = s.ticketFk
-                    JOIN item i ON i.id = s.itemFk
-                    JOIN itemType it ON it.id = i.typeFk
-                WHERE
-                    t.clientFk = ? AND it.isPackaging = FALSE
-                        AND DATE(t.shipped) BETWEEN ? AND ?
-                GROUP BY s.itemFk
-                ORDER BY i.typeFk , i.name`, [clientId, from, to]);
         },
     },
     components: {

print/templates/reports/campaign-metrics/sql/client.sql

@@ -0,0 +1,13 @@
+SELECT
+    c.street,
+    c.socialName,
+    c.city,
+    c.postcode,
+    c.id,
+    c.name AS clientName,
+    p.name AS province,
+    co.country                    
+FROM client c
+    JOIN province p ON c.provinceFk = p.id
+    JOIN country co ON c.countryFk = co.id
+WHERE c.id = ?

print/templates/reports/campaign-metrics/sql/sales.sql

@@ -0,0 +1,20 @@
+SELECT
+    SUM(s.quantity) AS subtotal,
+    s.itemFk,
+    s.concept,
+    i.subName,
+    i.tag5,
+    i.value5,
+    i.tag6,
+    i.value6,
+    i.tag7,
+    i.value7
+FROM sale s
+    JOIN ticket t ON t.id = s.ticketFk
+    JOIN item i ON i.id = s.itemFk
+    JOIN itemType it ON it.id = i.typeFk
+WHERE
+    t.clientFk = ? AND it.isPackaging = FALSE
+        AND DATE(t.shipped) BETWEEN ? AND ?
+GROUP BY s.itemFk
+ORDER BY i.typeFk , i.name

print/templates/reports/claim-pickup-order/claim-pickup-order.js

@@ -1,5 +1,4 @@
 const Component = require(`${appPath}/core/component`);
-const db = require(`${appPath}/core/database`);
 const reportHeader = new Component('report-header');
 const reportFooter = new Component('report-footer');
 
@@ -21,37 +20,10 @@ module.exports = {
     },
     methods: {
         fetchClient(claimId) {
-            return db.findOne(
+            return this.findOneFromDef('client', [claimId]);
-                `SELECT
-                        c.id,
-                        c.socialName,
-                        c.name,
-                        c.fi,
-                        a.city,
-                        a.postalCode,
-                        a.street,
-                        a.nickname,
-                        p.name AS province,
-                        ct.country
-                    FROM claim cl
-                        JOIN client c ON c.id = cl.clientFk
-                        JOIN account.user u ON u.id = c.id
-                        JOIN country ct ON ct.id = c.countryFk
-                        JOIN ticket t ON t.id = cl.ticketFk
-                        JOIN address a ON a.id = t.addressFk
-                        LEFT JOIN province p ON p.id = c.provinceFk
-                    WHERE cl.id = ?`, [claimId]);
         },
         fetchSales(claimId) {
-            return db.rawSql(
+            return this.rawSqlFromDef('sales', [claimId]);
-                `SELECT
-                        s.id,
-                        s.quantity,
-                        s.concept,
-                        cb.quantity claimQuantity
-                    FROM claimBeginning cb
-                        JOIN sale s ON s.id = cb.saleFk
-                    WHERE cb.claimFk = ?`, [claimId]);
         },
     },
     components: {

print/templates/reports/claim-pickup-order/sql/client.sql

@@ -0,0 +1,19 @@
+SELECT
+    c.id,
+    c.socialName,
+    c.name,
+    c.fi,
+    a.city,
+    a.postalCode,
+    a.street,
+    a.nickname,
+    p.name AS province,
+    ct.country
+FROM claim cl
+    JOIN client c ON c.id = cl.clientFk
+    JOIN account.user u ON u.id = c.id
+    JOIN country ct ON ct.id = c.countryFk
+    JOIN ticket t ON t.id = cl.ticketFk
+    JOIN address a ON a.id = t.addressFk
+    LEFT JOIN province p ON p.id = c.provinceFk
+WHERE cl.id = ?

print/templates/reports/claim-pickup-order/sql/sales.sql

@@ -0,0 +1,8 @@
+SELECT
+    s.id,
+    s.quantity,
+    s.concept,
+    cb.quantity claimQuantity
+FROM claimBeginning cb
+    JOIN sale s ON s.id = cb.saleFk
+WHERE cb.claimFk = ?

print/templates/reports/delivery-note/assets/css/style.css

@@ -16,4 +16,8 @@
 h3 {
     font-weight: 100;
     color: #555
+}
+
+.ticket-info {
+    font-size: 20px
 }

print/templates/reports/delivery-note/delivery-note.html

@@ -16,7 +16,7 @@
                                     <div class="size50">
                                         <div class="size75">
                                             <h1 class="title uppercase">{{$t('title')}}</h1>
-                                            <table class="row-oriented">
+                                            <table class="row-oriented ticket-info">
                                                 <tbody>
                                                     <tr>
                                                         <td class="font gray uppercase">{{$t('clientId')}}</td>

print/templates/reports/delivery-note/delivery-note.js

@@ -1,5 +1,4 @@
 const config = require(`${appPath}/core/config`);
-const db = require(`${appPath}/core/database`);
 const Component = require(`${appPath}/core/component`);
 const reportHeader = new Component('report-header');
 const reportFooter = new Component('report-footer');
@@ -42,132 +41,30 @@ module.exports = {
     },
     methods: {
         fetchClient(ticketId) {
-            return db.findOne(
+            return this.findOneFromDef('client', [ticketId]);
-                `SELECT
-                        c.id,
-                        c.socialName,
-                        c.street,
-                        c.fi
-                FROM ticket t
-                    JOIN client c ON c.id = t.clientFk
-                WHERE t.id = ?`, [ticketId]);
         },
         fetchTicket(ticketId) {
-            return db.findOne(
+            return this.findOneFromDef('ticket', [ticketId]);
-                `SELECT
-                        t.id,
-                        t.shipped,
-                        c.code companyCode
-                FROM ticket t
-                    JOIN company c ON c.id = t.companyFk
-                WHERE t.id = ?`, [ticketId]);
         },
         fetchAddress(ticketId) {
-            return db.findOne(
+            return this.findOneFromDef(`address`, [ticketId]);
-                `SELECT
-                    a.nickname,
-                    a.street,
-                    a.postalCode,
-                    a.city,
-                    p.name province
-                FROM ticket t
-                    JOIN address a ON a.clientFk = t.clientFk
-                        AND a.id = t.addressFk
-                    LEFT JOIN province p ON p.id = a.provinceFk
-                WHERE t.id = ?`, [ticketId]);
-        },
-
-        fetchSales(ticketId) {
-            return db.rawSql(
-                `SELECT 
-                    s.id,
-                    s.itemFk,
-                    s.concept,
-                    s.quantity,
-                    s.price,
-                    s.price - SUM(IF(ctr.id = 6,
-                        sc.value,
-                        0)) netPrice,
-                    s.discount,
-                    i.size,
-                    i.stems,
-                    i.category,
-                    it.id itemTypeId,
-                    o.code AS origin,
-                    i.inkFk,
-                    s.ticketFk,
-                    tcl.code vatType,
-                    ibwg.ediBotanic, ppa.denomination, pp.number passportNumber,
-                    be.isProtectedZone, c.code AS countryCode,
-                    i.tag5, i.value5,
-                    i.tag6, i.value6, i.tag7, i.value7
-                FROM vn.sale s
-                    LEFT JOIN saleComponent sc ON sc.saleFk = s.id
-                    LEFT JOIN component cr ON cr.id = sc.componentFk
-                    LEFT JOIN componentType ctr ON ctr.id = cr.typeFk
-                    LEFT JOIN item i ON i.id = s.itemFk
-                    LEFT JOIN ticket t ON t.id = s.ticketFk
-                    LEFT JOIN origin o ON o.id = i.originFk
-                    LEFT JOIN country c ON c.id = o.countryFk
-                    LEFT JOIN supplier sp ON sp.id = t.companyFk
-                    LEFT JOIN itemType it ON it.id = i.typeFk
-                    LEFT JOIN itemTaxCountry itc ON itc.itemFk = i.id 
-                        AND itc.countryFk = sp.countryFk 
-                    LEFT JOIN taxClass tcl ON tcl.id = itc.taxClassFk
-                    LEFT JOIN plantpassport pp ON pp.producerFk = i.producerFk
-                    LEFT JOIN plantpassportAuthority ppa ON ppa.id = pp.plantpassportAuthorityFk
-                    LEFT JOIN itemBotanicalWithGenus ibwg ON ibwg.itemFk = i.id
-                    LEFT JOIN botanicExport be ON be.restriction = 'pasaporte fitosanitario'
-                    LEFT JOIN ediGenus eg ON eg.id = be.ediGenusFk
-                    LEFT JOIN ediSpecie es ON es.id = be.ediSpecieFk
-                        AND ibwg.ediBotanic LIKE CONCAT(
-                                IFNULL(eg.latinGenusName, ''),
-                                IF(es.latinSpeciesName > '',
-                                    CONCAT(' ', es.latinSpeciesName), ''),
-                            '%')
-                WHERE s.ticketFk = ?
-                GROUP BY s.id
-                ORDER BY (it.isPackaging), s.concept, s.itemFk`, [ticketId]);
-        },
-        fetchTaxes(ticketId) {
-            return db.rawSql(`CALL vn.ticketGetTaxAdd(?)`, [ticketId]).then(rows => {
-                return rows[0];
-            });
-        },
-        fetchPackagings(ticketId) {
-            return db.rawSql(
-                `SELECT 
-                    tp.quantity, 
-                    i.name, 
-                    p.itemFk
-                FROM ticketPackaging tp
-                    JOIN packaging p ON p.id = tp.packagingFk
-                    JOIN item i ON i.id = p.itemFk
-                WHERE tp.ticketFk = ?
-                ORDER BY itemFk`, [ticketId]);
-        },
-        fetchServices(ticketId) {
-            return db.rawSql(
-                `SELECT 
-                    tc.description taxDescription,
-                    ts.description,
-                    ts.quantity, 
-                    ts.price
-                FROM ticketService ts
-                    JOIN taxClass tc ON tc.id = ts.taxClassFk
-                WHERE ts.ticketFk = ?`, [ticketId]);
         },
         fetchSignature(ticketId) {
-            return db.findOne(
+            return this.findOneFromDef('signature', [ticketId]);
-                `SELECT
-                    d.id,
-                    d.created
-                FROM ticket t
-                    JOIN ticketDms dt ON dt.ticketFk = t.id
-                    JOIN dms d ON d.id = dt.dmsFk 
-                        AND d.file LIKE '%.png'
-                WHERE t.id = ?`, [ticketId]);
         },
+        fetchTaxes(ticketId) {
+            return this.findOneFromDef(`taxes`, [ticketId]);
+        },
+        fetchSales(ticketId) {
+            return this.rawSqlFromDef('sales', [ticketId]);
+        },
+        fetchPackagings(ticketId) {
+            return this.rawSqlFromDef('packagings', [ticketId]);
+        },
+        fetchServices(ticketId) {
+            return this.rawSqlFromDef('services', [ticketId]);
+        },
+
         getSubTotal() {
             let subTotal = 0.00;
             this.sales.forEach(sale => {
@@ -194,7 +91,7 @@ module.exports = {
         },
         getTotal() {
             return this.getTotalBase() + this.getTotalTax();
-        },
+        }
     },
     components: {
         'report-header': reportHeader.build(),

print/templates/reports/delivery-note/sql/address.sql

@@ -0,0 +1,11 @@
+SELECT
+    a.nickname,
+    a.street,
+    a.postalCode,
+    a.city,
+    p.name province
+FROM ticket t
+    JOIN address a ON a.clientFk = t.clientFk
+        AND a.id = t.addressFk
+    LEFT JOIN province p ON p.id = a.provinceFk
+WHERE t.id = ?

print/templates/reports/delivery-note/sql/client.sql

@@ -0,0 +1,8 @@
+SELECT
+        c.id,
+        c.socialName,
+        c.street,
+        c.fi
+FROM ticket t
+    JOIN client c ON c.id = t.clientFk
+WHERE t.id = ?

print/templates/reports/delivery-note/sql/packagings.sql

@@ -0,0 +1,9 @@
+SELECT 
+    tp.quantity, 
+    i.name, 
+    p.itemFk
+FROM ticketPackaging tp
+    JOIN packaging p ON p.id = tp.packagingFk
+    JOIN item i ON i.id = p.itemFk
+WHERE tp.ticketFk = ?
+ORDER BY itemFk

print/templates/reports/delivery-note/sql/sales.sql

@@ -0,0 +1,53 @@
+SELECT 
+    s.id,
+    s.itemFk,
+    s.concept,
+    s.quantity,
+    s.price,
+    s.price - SUM(IF(ctr.id = 6, sc.value, 0)) netPrice,
+    s.discount,
+    i.size,
+    i.stems,
+    i.category,
+    it.id itemTypeId,
+    o.code AS origin,
+    i.inkFk,
+    s.ticketFk,
+    tcl.code vatType,
+    ibwg.ediBotanic, 
+    ppa.denomination, 
+    pp.number passportNumber,
+    be.isProtectedZone, c.code AS countryCode,
+    i.tag5, 
+    i.value5,
+    i.tag6, 
+    i.value6, 
+    i.tag7, 
+    i.value7
+FROM vn.sale s
+    LEFT JOIN saleComponent sc ON sc.saleFk = s.id
+    LEFT JOIN component cr ON cr.id = sc.componentFk
+    LEFT JOIN componentType ctr ON ctr.id = cr.typeFk
+    LEFT JOIN item i ON i.id = s.itemFk
+    LEFT JOIN ticket t ON t.id = s.ticketFk
+    LEFT JOIN origin o ON o.id = i.originFk
+    LEFT JOIN country c ON c.id = o.countryFk
+    LEFT JOIN supplier sp ON sp.id = t.companyFk
+    LEFT JOIN itemType it ON it.id = i.typeFk
+    LEFT JOIN itemTaxCountry itc ON itc.itemFk = i.id 
+        AND itc.countryFk = sp.countryFk 
+    LEFT JOIN taxClass tcl ON tcl.id = itc.taxClassFk
+    LEFT JOIN plantpassport pp ON pp.producerFk = i.producerFk
+    LEFT JOIN plantpassportAuthority ppa ON ppa.id = pp.plantpassportAuthorityFk
+    LEFT JOIN itemBotanicalWithGenus ibwg ON ibwg.itemFk = i.id
+    LEFT JOIN botanicExport be ON be.restriction = 'pasaporte fitosanitario'
+    LEFT JOIN ediGenus eg ON eg.id = be.ediGenusFk
+    LEFT JOIN ediSpecie es ON es.id = be.ediSpecieFk
+        AND ibwg.ediBotanic LIKE CONCAT(
+                IFNULL(eg.latinGenusName, ''),
+                IF(es.latinSpeciesName > '',
+                    CONCAT(' ', es.latinSpeciesName), ''),
+            '%')
+WHERE s.ticketFk = ?
+GROUP BY s.id
+ORDER BY (it.isPackaging), s.concept, s.itemFk

print/templates/reports/delivery-note/sql/services.sql

@@ -0,0 +1,8 @@
+SELECT 
+    tc.description taxDescription,
+    ts.description,
+    ts.quantity, 
+    ts.price
+FROM ticketService ts
+    JOIN taxClass tc ON tc.id = ts.taxClassFk
+WHERE ts.ticketFk = ?

print/templates/reports/delivery-note/sql/signature.sql

@@ -0,0 +1,8 @@
+SELECT
+    d.id,
+    d.created
+FROM ticket t
+    JOIN ticketDms dt ON dt.ticketFk = t.id
+    JOIN dms d ON d.id = dt.dmsFk 
+        AND d.file LIKE '%.png'
+WHERE t.id = ?

print/templates/reports/delivery-note/sql/taxes.sql

@@ -0,0 +1 @@
+CALL vn.ticketGetTaxAdd(?)

print/templates/reports/delivery-note/sql/ticket.sql

@@ -0,0 +1,7 @@
+SELECT
+    t.id,
+    t.shipped,
+    c.code companyCode
+FROM ticket t
+    JOIN company c ON c.id = t.companyFk
+WHERE t.id = ?

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

@@ -1,5 +1,4 @@
 const Component = require(`${appPath}/core/component`);
-const db = require(`${appPath}/core/database`);
 const reportHeader = new Component('report-header');
 const reportFooter = new Component('report-footer');
 
@@ -28,60 +27,10 @@ module.exports = {
     },
     methods: {
         fetchRoutes(routesId) {
-            return db.rawSql(
+            return this.rawSqlFromDef('routes', {routesId});
-                `SELECT 
-                    r.id,
-                    r.m3,
-                    r.created,
-                    r.time,
-                    u.nickName userNickName,
-                    v.tradeMark vehicleTradeMark,
-                    v.model vehicleModel,
-                    v.numberPlate plateNumber,
-                    am.name agencyName
-                FROM route r
-                    LEFT JOIN vehicle v ON v.id = r.vehicleFk
-                    LEFT JOIN worker w ON w.id = r.workerFk
-                    LEFT JOIN account.user u ON u.id = w.userFk
-                    LEFT JOIN agencyMode am ON am.id = r.agencyModeFk
-                WHERE r.id IN(:routesId)`, {routesId});
         },
         fetchTickets(routesId) {
-            return db.rawSql(
+            return this.rawSqlFromDef('tickets', {routesId});
-                `SELECT
-                    t.nickname addressName,
-                    t.packages,
-                    t.priority,
-                    t.id,
-                    t.clientFk,
-                    t.companyFk,
-                    t.routeFk,
-                    if(a.phone, a.phone, c.phone) AS phone,
-                    if(a.mobile, a.mobile, c.mobile) AS mobile,
-                    wh.name warehouseName,
-                    a.city,
-                    a.street,
-                    a.postalCode,
-                    LPAD(a.id, 5, '0') AS addressFk,
-                    p.name province,
-                    0 AS import,
-                    am.name ticketAgency,
-                    tob.description,
-                    s.shipFk,
-                    u.nickName salesPersonName
-                FROM route r 
-                    LEFT JOIN ticket t ON t.routeFk = r.id
-                    LEFT JOIN address a ON a.id = t.addressFk
-                    LEFT JOIN client c ON c.id = t.clientFk
-                    LEFT JOIN worker w ON w.id = client_getSalesPerson(t.clientFk, CURDATE())
-                    LEFT JOIN account.user u ON u.id = w.userFk
-                    LEFT JOIN ticketObservation tob ON tob.ticketFk = t.id AND tob.observationTypeFk = 3
-                    LEFT JOIN province p ON a.provinceFk = p.id
-                    LEFT JOIN warehouse wh ON wh.id = t.warehouseFk
-                    LEFT JOIN agencyMode am ON am.id = t.agencyModeFk
-                    LEFT JOIN stowaway s ON s.id = t.id
-                WHERE r.id IN(:routesId)
-                ORDER BY t.priority, t.id`, {routesId});
         }
     },
     components: {

print/templates/reports/driver-route/sql/routes.sql

@@ -0,0 +1,16 @@
+SELECT 
+    r.id,
+    r.m3,
+    r.created,
+    r.time,
+    u.nickName userNickName,
+    v.tradeMark vehicleTradeMark,
+    v.model vehicleModel,
+    v.numberPlate plateNumber,
+    am.name agencyName
+FROM route r
+    LEFT JOIN vehicle v ON v.id = r.vehicleFk
+    LEFT JOIN worker w ON w.id = r.workerFk
+    LEFT JOIN account.user u ON u.id = w.userFk
+    LEFT JOIN agencyMode am ON am.id = r.agencyModeFk
+WHERE r.id IN(:routesId)

print/templates/reports/driver-route/sql/tickets.sql

@@ -0,0 +1,34 @@
+SELECT
+    t.nickname addressName,
+    t.packages,
+    t.priority,
+    t.id,
+    t.clientFk,
+    t.companyFk,
+    t.routeFk,
+    if(a.phone, a.phone, c.phone) AS phone,
+    if(a.mobile, a.mobile, c.mobile) AS mobile,
+    wh.name warehouseName,
+    a.city,
+    a.street,
+    a.postalCode,
+    LPAD(a.id, 5, '0') AS addressFk,
+    p.name province,
+    0 AS import,
+    am.name ticketAgency,
+    tob.description,
+    s.shipFk,
+    u.nickName salesPersonName
+FROM route r 
+    LEFT JOIN ticket t ON t.routeFk = r.id
+    LEFT JOIN address a ON a.id = t.addressFk
+    LEFT JOIN client c ON c.id = t.clientFk
+    LEFT JOIN worker w ON w.id = client_getSalesPerson(t.clientFk, CURDATE())
+    LEFT JOIN account.user u ON u.id = w.userFk
+    LEFT JOIN ticketObservation tob ON tob.ticketFk = t.id AND tob.observationTypeFk = 3
+    LEFT JOIN province p ON a.provinceFk = p.id
+    LEFT JOIN warehouse wh ON wh.id = t.warehouseFk
+    LEFT JOIN agencyMode am ON am.id = t.agencyModeFk
+    LEFT JOIN stowaway s ON s.id = t.id
+WHERE r.id IN(:routesId)
+ORDER BY t.priority, t.id

print/templates/reports/entry-order/entry-order.js

@@ -1,4 +1,3 @@
-const db = require(`${appPath}/core/database`);
 const Component = require(`${appPath}/core/component`);
 const reportHeader = new Component('report-header');
 const reportFooter = new Component('report-footer');
@@ -18,50 +17,13 @@ module.exports = {
     },
     methods: {
         fetchSupplier(entryId) {
-            return db.findOne(
+            return this.findOneFromDef('supplier', [entryId]);
-                `SELECT
-                        s.name,
-                        s.street,
-                        s.nif,
-                        s.postCode,
-                        s.city,
-                        p.name province
-                FROM supplier s
-                    JOIN entry e ON e.supplierFk = s.id
-                    LEFT JOIN province p ON p.id = s.provinceFk
-                WHERE e.id = ?`, [entryId]);
         },
         fetchEntry(entryId) {
-            return db.findOne(
+            return this.findOneFromDef('entry', [entryId]);
-                `SELECT
-                        e.id,
-                        e.ref,
-                        e.notes,
-                        c.code companyCode,
-                        t.landed
-                FROM entry e
-                    JOIN travel t ON t.id = e.travelFk
-                    JOIN company c ON c.id = e.companyFk
-                WHERE e.id = ?`, [entryId]);
         },
         fetchBuys(entryId) {
-            return db.rawSql(
+            return this.rawSqlFromDef('buys', [entryId]);
-                `SELECT
-                    b.itemFk,
-                    b.quantity,
-                    b.buyingValue,
-                    b.stickers box,
-                    b.packing,
-                    i.name itemName,
-                    i.tag5,
-                    i.value5,
-                    i.tag6,
-                    i.value6,
-                    i.tag7,
-                    i.value7
-                FROM buy b
-                    JOIN item i ON i.id = b.itemFk
-                WHERE b.entryFk = ?`, [entryId]);
         },
         getTotal() {
             let total = 0.00;

print/templates/reports/entry-order/sql/buys.sql

@@ -0,0 +1,16 @@
+SELECT
+    b.itemFk,
+    b.quantity,
+    b.buyingValue,
+    b.stickers box,
+    b.packing,
+    i.name itemName,
+    i.tag5,
+    i.value5,
+    i.tag6,
+    i.value6,
+    i.tag7,
+    i.value7
+FROM buy b
+    JOIN item i ON i.id = b.itemFk
+WHERE b.entryFk = ?

print/templates/reports/entry-order/sql/entry.sql

@@ -0,0 +1,10 @@
+SELECT
+    e.id,
+    e.ref,
+    e.notes,
+    c.code companyCode,
+    t.landed
+FROM entry e
+    JOIN travel t ON t.id = e.travelFk
+    JOIN company c ON c.id = e.companyFk
+WHERE e.id = ?

print/templates/reports/entry-order/sql/supplier.sql

@@ -0,0 +1,11 @@
+SELECT
+    s.name,
+    s.street,
+    s.nif,
+    s.postCode,
+    s.city,
+    p.name province
+FROM supplier s
+    JOIN entry e ON e.supplierFk = s.id
+    LEFT JOIN province p ON p.id = s.provinceFk
+WHERE e.id = ?

print/templates/reports/item-label/item-label.js

@@ -1,5 +1,4 @@
 const Component = require(`${appPath}/core/component`);
-const db = require(`${appPath}/core/database`);
 const reportHeader = new Component('report-header');
 const reportFooter = new Component('report-footer');
 const qrcode = require('qrcode');
@@ -30,26 +29,10 @@ module.exports = {
     },
     methods: {
         fetchItem(id, warehouseId) {
-            return db.findOne(
+            return this.findOneFromDef('item', [id, warehouseId]);
-                `SELECT 
-                    i.id, 
-                    i.name,
-                    i.stems, 
-                    i.size,
-                    b.packing
-                FROM vn.item i
-                    JOIN cache.last_buy clb ON clb.item_id = i.id
-                    JOIN vn.buy b ON b.id = clb.buy_id
-                    JOIN vn.entry e ON e.id = b.entryFk
-                WHERE i.id = ? AND clb.warehouse_id = ?`, [id, warehouseId]);
         },
         fetchItemTags(itemId) {
-            return db.rawSql(
+            return this.rawSqlFromDef('itemTags', [itemId]).then(rows => {
-                `SELECT t.code, t.name, it.value
-                    FROM vn.itemTag it
-                        JOIN vn.tag t ON t.id = it.tagFk
-                    WHERE it.itemFk = ?
-                `, [itemId]).then(rows => {
                 const tags = {};
                 rows.forEach(row => tags[row.code] = row.value);
 

print/templates/reports/item-label/sql/item.sql

@@ -0,0 +1,11 @@
+SELECT 
+    i.id, 
+    i.name,
+    i.stems, 
+    i.size,
+    b.packing
+FROM vn.item i
+    JOIN cache.last_buy clb ON clb.item_id = i.id
+    JOIN vn.buy b ON b.id = clb.buy_id
+    JOIN vn.entry e ON e.id = b.entryFk
+WHERE i.id = ? AND clb.warehouse_id = ?

print/templates/reports/item-label/sql/itemTags.sql

@@ -0,0 +1,4 @@
+SELECT t.code, t.name, it.value
+FROM vn.itemTag it
+    JOIN vn.tag t ON t.id = it.tagFk
+WHERE it.itemFk = ?

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

@@ -1,5 +1,4 @@
 const Component = require(`${appPath}/core/component`);
-const db = require(`${appPath}/core/database`);
 const reportHeader = new Component('report-header');
 const reportFooter = new Component('report-footer');
 
@@ -24,28 +23,12 @@ module.exports = {
     },
     methods: {
         fetchClient(clientId) {
-            return db.findOne(
+            return this.findOneFromDef('client', [clientId]);
-                `SELECT
-                        c.id,
-                        c.socialName,
-                        c.street,
-                        c.postcode,
-                        c.city,
-                        c.fi,
-                        p.name AS province,
-                        ct.country
-                FROM client c
-                    JOIN country ct ON ct.id = c.countryFk
-                    LEFT JOIN province p ON p.id = c.provinceFk
-                WHERE c.id = ?`, [clientId]);
         },
         fetchSales(clientId, companyId) {
-            return db.rawSql(
+            return this.findOneFromDef('sales', {
-                `CALL vn.clientGetDebtDiary(:clientId, :companyId)`, {
+                clientId: clientId,
-                    clientId: clientId,
+                companyId: companyId,
-                    companyId: companyId,
-                }).then(rows => {
-                return rows[0];
             });
         },
         getBalance(sale) {

print/templates/reports/letter-debtor/sql/client.sql

@@ -0,0 +1,13 @@
+SELECT
+    c.id,
+    c.socialName,
+    c.street,
+    c.postcode,
+    c.city,
+    c.fi,
+    p.name AS province,
+    ct.country
+FROM client c
+    JOIN country ct ON ct.id = c.countryFk
+    LEFT JOIN province p ON p.id = c.provinceFk
+WHERE c.id = ?

print/templates/reports/letter-debtor/sql/sales.sql

@@ -0,0 +1 @@
+CALL vn.clientGetDebtDiary(:clientId, :companyId)

print/templates/reports/receipt/receipt.js

@@ -1,5 +1,4 @@
 const Component = require(`${appPath}/core/component`);
-const db = require(`${appPath}/core/database`);
 const reportHeader = new Component('report-header');
 const reportFooter = new Component('report-footer');
 
@@ -14,27 +13,10 @@ module.exports = {
     },
     methods: {
         fetchClient(receiptId) {
-            return db.findOne(
+            return this.findOneFromDef('client', [receiptId]);
-                `SELECT 
-                    c.id,
-                    c.socialName,
-                    u.lang locale
-                FROM receipt r
-                    JOIN client c ON c.id = r.clientFk
-                    JOIN account.user u ON u.id = c.id
-                WHERE r.id = ?`, [receiptId]);
         },
         fetchReceipt(receiptId) {
-            return db.findOne(
+            return this.findOneFromDef('receipt', [receiptId]);
-                `SELECT 
-                    r.id, 
-                    r.amountPaid, 
-                    r.amountUnpaid, 
-                    r.payed, 
-                    r.companyFk
-                FROM receipt r
-                    JOIN client c ON c.id = r.clientFk
-                WHERE r.id = ?`, [receiptId]);
         }
     },
     components: {

print/templates/reports/receipt/sql/client.sql

@@ -0,0 +1,8 @@
+SELECT 
+    c.id,
+    c.socialName,
+    u.lang locale
+FROM receipt r
+    JOIN client c ON c.id = r.clientFk
+    JOIN account.user u ON u.id = c.id
+WHERE r.id = ?

print/templates/reports/receipt/sql/receipt.sql

@@ -0,0 +1,9 @@
+SELECT 
+    r.id, 
+    r.amountPaid, 
+    r.amountUnpaid, 
+    r.payed, 
+    r.companyFk
+FROM receipt r
+    JOIN client c ON c.id = r.clientFk
+WHERE r.id = ?

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

@@ -1,5 +1,4 @@
 const Component = require(`${appPath}/core/component`);
-const db = require(`${appPath}/core/database`);
 const reportHeader = new Component('report-header');
 const reportFooter = new Component('report-footer');
 
@@ -21,46 +20,10 @@ const rptSepaCore = {
     },
     methods: {
         fetchClient(clientId, companyId) {
-            return db.findOne(
+            return this.findOneFromDef('client', {companyId, clientId});
-                `SELECT
-                        c.id,
-                        m.code mandateCode,
-                        c.socialName,
-                        c.street,
-                        c.postcode,
-                        c.city,
-                        c.fi,
-                        p.name AS province,
-                        ct.country,
-                        ct.code AS countryCode,
-                        ct.ibanLength AS ibanLength
-                FROM client c
-                    JOIN country ct ON ct.id = c.countryFk
-                    LEFT JOIN mandate m ON m.clientFk = c.id 
-                        AND m.companyFk = :companyId AND m.finished IS NULL
-                    LEFT JOIN province p ON p.id = c.provinceFk
-                WHERE (m.companyFk = :companyId OR m.companyFk IS NULL) AND c.id = :clientId
-                ORDER BY m.created DESC LIMIT 1`, {companyId, clientId});
         },
         fetchSupplier(clientId, companyId) {
-            return db.findOne(
+            return this.findOneFromDef('supplier', {companyId, clientId});
-                `SELECT
-                        m.code mandateCode,
-                        s.name,
-                        s.street,
-                        sc.country,
-                        s.postCode,
-                        s.city,
-                        sp.name province
-                FROM client c
-                    LEFT JOIN mandate m ON m.clientFk = c.id 
-                        AND m.companyFk = :companyId AND m.finished IS NULL
-                    LEFT JOIN supplier s ON s.id = m.companyFk
-                    LEFT JOIN country sc ON sc.id = s.countryFk
-                    LEFT JOIN province sp ON sp.id = s.provinceFk
-                    LEFT JOIN province p ON p.id = c.provinceFk
-                WHERE (m.companyFk = :companyId OR m.companyFk IS NULL) AND c.id = :clientId
-                ORDER BY m.created DESC LIMIT 1`, {companyId, clientId});
         }
     },
     components: {

print/templates/reports/sepa-core/sql/client.sql

@@ -0,0 +1,19 @@
+SELECT
+        c.id,
+        m.code mandateCode,
+        c.socialName,
+        c.street,
+        c.postcode,
+        c.city,
+        c.fi,
+        p.name AS province,
+        ct.country,
+        ct.code AS countryCode,
+        ct.ibanLength AS ibanLength
+FROM client c
+    JOIN country ct ON ct.id = c.countryFk
+    LEFT JOIN mandate m ON m.clientFk = c.id 
+        AND m.companyFk = :companyId AND m.finished IS NULL
+    LEFT JOIN province p ON p.id = c.provinceFk
+WHERE (m.companyFk = :companyId OR m.companyFk IS NULL) AND c.id = :clientId
+ORDER BY m.created DESC LIMIT 1

print/templates/reports/sepa-core/sql/supplier.sql

@@ -0,0 +1,17 @@
+SELECT
+        m.code mandateCode,
+        s.name,
+        s.street,
+        sc.country,
+        s.postCode,
+        s.city,
+        sp.name province
+FROM client c
+    LEFT JOIN mandate m ON m.clientFk = c.id 
+        AND m.companyFk = :companyId AND m.finished IS NULL
+    LEFT JOIN supplier s ON s.id = m.companyFk
+    LEFT JOIN country sc ON sc.id = s.countryFk
+    LEFT JOIN province sp ON sp.id = s.provinceFk
+    LEFT JOIN province p ON p.id = c.provinceFk
+WHERE (m.companyFk = :companyId OR m.companyFk IS NULL) AND c.id = :clientId
+ORDER BY m.created DESC LIMIT 1

print/templates/reports/zone/assets/css/style.css

@@ -2,8 +2,9 @@ div.text {
     font-family: Tahoma;
     font-weight: bold;
     color: white;
-    font-size: 7.5em;
+    font-size: 12em;
     text-align: center;
     background-color: black;
-    margin-bottom: 0.2em
+    margin: 0.30em;
+    padding: 30px 0
 }

print/templates/reports/zone/options.json

@@ -0,0 +1,4 @@
+{
+    "landscape": true,
+    "format": "A4"
+}

print/templates/reports/zone/sql/zone.sql

@@ -0,0 +1,9 @@
+SELECT
+    r.id,
+    r.time,
+    am.name agencyName,
+    v.numberPlate plateNumber
+FROM route r
+    JOIN agencyMode am ON am.id = r.agencyModeFk
+    JOIN vehicle v ON v.id = r.vehicleFk
+WHERE r.id = :routeId

print/templates/reports/zone/zone.js

@@ -1,5 +1,3 @@
-const db = require(`${appPath}/core/database`);
-
 module.exports = {
     name: 'zone',
     async serverPrefetch() {
@@ -10,16 +8,7 @@ module.exports = {
     },
     methods: {
         fetchZone(routeId) {
-            return db.findOne(
+            return this.findOneFromDef('zone', {routeId});
-                `SELECT
-                    r.id,
-                    r.time,
-                    am.name agencyName,
-                    v.numberPlate plateNumber
-                FROM route r
-                    JOIN agencyMode am ON am.id = r.agencyModeFk
-                    JOIN vehicle v ON v.id = r.vehicleFk
-                WHERE r.id = :routeId`, {routeId});
         }
     },
     props: {