Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing

.vscode/settings.json

@@ -2,7 +2,13 @@
 {
     // Carácter predeterminado de final de línea.
     "files.eol": "\n",
-    "editor.codeActionsOnSave": {
+    "editor.bracketPairColorization.enabled": true,
-        "source.fixAll.eslint": true
+    "editor.guides.bracketPairs": true,
-    }
+    "editor.formatOnSave": true,
+    "editor.defaultFormatter": "dbaeumer.vscode-eslint",
+    "editor.codeActionsOnSave": ["source.fixAll.eslint"],
+    "eslint.validate": [
+        "javascript",
+        "json"
+    ]
 }

Dockerfile

@@ -1,32 +1,43 @@
-FROM debian:stretch-slim
+FROM debian:bullseye-slim
 ENV TZ Europe/Madrid
 
 ARG DEBIAN_FRONTEND=noninteractive
+
+# NodeJs
+
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
         curl \
         ca-certificates \
         gnupg2 \
-        libfontconfig lftp \
+    && curl -fsSL https://deb.nodesource.com/setup_14.x | bash - \
-    && apt-get -y install xvfb gconf-service libasound2 libatk1.0-0 libc6 libcairo2 libcups2 \
+    && apt-get install -y --no-install-recommends nodejs \
-      libdbus-1-3 libexpat1 libfontconfig1 libgbm1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 \
+    && npm install -g npm@8.19.2
-      libgtk-3-0 libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 \
+
-      libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 \
+# Puppeteer
-      libxtst6 ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget \
+
-    && curl -sL https://deb.nodesource.com/setup_14.x | bash - \
+RUN apt-get update \
     && apt-get install -y --no-install-recommends \
-        nodejs \
+        libfontconfig lftp xvfb gconf-service libasound2 libatk1.0-0 libc6 \
-    && apt-get purge -y --auto-remove \
+        libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgbm1 \
-        gnupg2 \
+        libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 \
+        libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 \
+        libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 \
+        libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 \
+        fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget \
     && rm -rf /var/lib/apt/lists/* \
     && npm -g install pm2
 
+# Salix
+
 WORKDIR /salix
+
+COPY print/package.json print/package-lock.json print/
+RUN npm --prefix ./print install --omit=dev ./print
+
 COPY package.json package-lock.json ./
 COPY loopback/package.json loopback/
-COPY print/package.json print/
+RUN npm install --omit=dev
-RUN npm install --only=prod
-RUN npm --prefix ./print install --only=prod ./print
 
 COPY loopback loopback
 COPY back back

back/methods/dms/deleteTrashFiles.js

@@ -47,20 +47,22 @@ module.exports = Self => {
         for (let dms of dmsToDelete) {
             const pathHash = DmsContainer.getHash(dms.id);
             const dmsContainer = await DmsContainer.container(pathHash);
-            const dstFile = path.join(dmsContainer.client.root, pathHash, dms.file);
             try {
+                const dstFile = path.join(dmsContainer.client.root, pathHash, dms.file);
                 await fs.unlink(dstFile);
             } catch (err) {
-                continue;
+                if (err.code != 'ENOENT')
+                    throw err;
             }
+
+            await dms.destroy(myOptions);
+
             const dstFolder = path.join(dmsContainer.client.root, pathHash);
             try {
                 await fs.rmdir(dstFolder);
             } catch (err) {
                 continue;
             }
-
-            await dms.destroy(myOptions);
         }
     };
 };

db/changes/10491-august/00-invoiceInPdf.sql

@@ -1,4 +1,4 @@
 INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
     VALUES
         ('InvoiceIn', 'invoiceInPdf', 'READ', 'ALLOW', 'ROLE', 'administrative'),
-        ('InvoiceIn', 'invoiceInEmail', 'WRITE', 'ALLOW', 'ROLE', 'administrative'),
+        ('InvoiceIn', 'invoiceInEmail', 'WRITE', 'ALLOW', 'ROLE', 'administrative');

db/docker.js

@@ -47,12 +47,8 @@ module.exports = class Docker {
         if (ci) network = `--network="${networkName}"`;
 
         log('Starting container...');
-        const container = await this.execP(`
+        const container = await this.execP(
-            docker run \
+            `docker run ${network} --env RUN_CHOWN=${runChown} -d ${dockerArgs} salix-db`);
-                ${network} \
-                --env RUN_CHOWN=${runChown} \
-                -d ${dockerArgs} salix-db
-        `);
         this.id = container.stdout.trim();
 
         try {

db/dump/fixtures.sql

@@ -918,7 +918,7 @@ INSERT INTO `vn`.`expeditionStateType`(`id`, `description`, `code`)
         (3, 'Perdida', 'LOST');
 
 
-INSERT INTO `vn`.`expedition`(`id`, `agencyModeFk`, `ticketFk`, `isBox`, `created`, `itemFk`, `counter`, `workerFk`, `externalId`, `packagingFk`, `stateTypeFk`, `hostFk`)
+INSERT INTO `vn`.`expedition`(`id`, `agencyModeFk`, `ticketFk`, `freightItemFk`, `created`, `itemFk`, `counter`, `workerFk`, `externalId`, `packagingFk`, `stateTypeFk`, `hostFk`)
     VALUES
         (1,  1, 1, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),  15,      1,  18, 'UR9000006041',   94, 1,   'pc1'),
         (2,  1, 1, 71, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH),  16,      2,  18, 'UR9000006041',   94, 1,   NULL),

db/dump/structure.sql

@@ -27518,7 +27518,7 @@ CREATE TABLE `expedition` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `agencyModeFk` int(11) NOT NULL,
   `ticketFk` int(10) NOT NULL,
-  `isBox` int(11) DEFAULT 1 COMMENT 'Este campo realmente en un campo itemFk, haciendo referencia al artículo que nos va a facturar el proveedor de transporte.\nSe debería llamar freightItemFk',
+  `freightItemFk` int(11) DEFAULT 1 COMMENT 'Este campo realmente en un campo itemFk, haciendo referencia al artículo que nos va a facturar el proveedor de transporte.\nSe debería llamar freightItemFk',
   `created` timestamp NULL DEFAULT current_timestamp(),
   `isRefund__` bit(1) DEFAULT b'0' COMMENT 'Deprecado 01/06/2022',
   `isPickUp__` bit(1) DEFAULT b'0' COMMENT 'Deprecado 01/06/2022',
@@ -27534,7 +27534,7 @@ CREATE TABLE `expedition` (
   `hasNewRoute` bit(1) NOT NULL DEFAULT b'0',
   PRIMARY KEY (`id`),
   KEY `index1` (`agencyModeFk`),
-  KEY `index2` (`isBox`),
+  KEY `index2` (`freightItemFk`),
   KEY `index3` (`created`),
   KEY `index4` (`ticketFk`),
   KEY `expedition_fk3_idx` (`packagingFk`),
@@ -27567,7 +27567,7 @@ BEGIN
 
     DECLARE vShipFk INT;
 
-	IF NEW.isBox > 0 THEN
+	IF NEW.freightItemFk > 0 THEN
 
 		UPDATE ticket SET packages = nz(packages) + 1 WHERE id = NEW.ticketFk;
 
@@ -27638,7 +27638,7 @@ DELIMITER ;;
 BEGIN
     UPDATE ticket t
         SET packages = (SELECT COUNT(counter)-1
-		FROM expedition e WHERE e.ticketFk = OLD.ticketFk and e.isBox)
+		FROM expedition e WHERE e.ticketFk = OLD.ticketFk and e.freightItemFk)
 		WHERE t.id = OLD.ticketFk;
 
 END */;;
@@ -36287,7 +36287,7 @@ CREATE TABLE `sorter` (
   `created` datetime NOT NULL,
   `routeFk` int(10) unsigned NOT NULL,
   `ticketFk` int(10) NOT NULL,
-  `isBox` int(11) DEFAULT 1,
+  `freightItemFk` int(11) DEFAULT 1,
   `itemFk` int(11) DEFAULT NULL,
   `width` decimal(10,2) DEFAULT 0.00,
   `depth` decimal(10,2) DEFAULT 0.00,
@@ -44956,7 +44956,7 @@ BEGIN
 		SELECT SUM((t.zonePrice - t.zoneBonus) * ebv.ratio) INTO deliveryPrice
 			FROM vn.ticket t
 				LEFT JOIN expedition e ON e.ticketFk = t.id
-				JOIN expeditionBoxVol ebv ON ebv.boxFk = e.isBox
+				JOIN expeditionBoxVol ebv ON ebv.boxFk = e.freightItemFk
 			WHERE t.id = vTicketFk;
 
 	END IF;
@@ -46492,7 +46492,7 @@ BEGIN
 			LEFT JOIN item i ON i.id = b.itemFk
 			LEFT JOIN itemType it ON it.id = i.typeFk
 			LEFT JOIN itemCategory ic ON ic.id = it.categoryFk
-			LEFT JOIN packaging p ON p.id = b.packageFk AND NOT p.isBox
+			LEFT JOIN packaging p ON p.id = b.packageFk AND NOT p.freightItemFk
 			JOIN volumeConfig vc ON TRUE
 		WHERE b.id = vSelf;
 
@@ -53229,7 +53229,7 @@ BEGIN
 			INNER JOIN vn.ticketState ts ON ts.ticketFk = exp.ticketFk
 			LEFT JOIN vn.address a ON t.addressFk = a.id
 			LEFT JOIN vn.warehouse w ON t.warehouseFk = w.id
-		WHERE t.routeFk = vRouteFk AND exp.isBox > 0;
+		WHERE t.routeFk = vRouteFk AND exp.freightItemFk > 0;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@@ -53760,7 +53760,7 @@ BEGIN
 						GROUP BY sub.ticketFk
 						) sub2 ON sub2.ticketFk = t.id
 			LEFT JOIN expeditionStateType est ON est.id  = e.stateTypeFk
-		WHERE t.routeFk = vRouteFk AND e.isBox <> FALSE
+		WHERE t.routeFk = vRouteFk AND e.freightItemFk <> FALSE
 		ORDER BY  r.created,  t.priority DESC;
 END ;;
 DELIMITER ;

front/core/components/input-file/index.html

@@ -3,7 +3,7 @@
         ng-transclude="prepend"
         class="prepend">
     </div>
-    <div class="infix">
+    <div class="infix" >
         <div class="fix prefix"></div>
         <div class="control">
             <section
@@ -13,8 +13,7 @@
             </section>
             <input
                 type="file"
-                accept="{{$ctrl.accept}}"
+                accept="{{$ctrl.accept}}">
-                style="display: none;">
             </input>
         </div>
         <div class="fix suffix"></div>

front/core/components/input-file/style.scss

@@ -4,4 +4,13 @@
     .value {
         cursor: pointer;
     }
+    .control {
+        & > input[type=file] {
+            opacity: 0;
+        }
+        & > section {
+            position: absolute;
+            bottom: 0;
+        }
+    }
 }

front/package-lock.json

@@ -24,10 +24,11 @@
 			}
 		},
 		"node_modules/@uirouter/angularjs": {
-			"version": "1.0.29",
+			"version": "1.0.30",
-			"license": "MIT",
+			"resolved": "https://registry.npmjs.org/@uirouter/angularjs/-/angularjs-1.0.30.tgz",
+			"integrity": "sha512-qkc3RFZc91S5K0gc/QVAXc9LGDPXjR04vDgG/11j8+yyZEuQojXxKxdLhKIepiPzqLmGRVqzBmBc27gtqaEeZg==",
 			"dependencies": {
-				"@uirouter/core": "6.0.7"
+				"@uirouter/core": "6.0.8"
 			},
 			"engines": {
 				"node": ">=4.0.0"
@@ -37,15 +38,18 @@
 			}
 		},
 		"node_modules/@uirouter/core": {
-			"version": "6.0.7",
+			"version": "6.0.8",
-			"license": "MIT",
+			"resolved": "https://registry.npmjs.org/@uirouter/core/-/core-6.0.8.tgz",
+			"integrity": "sha512-Gc/BAW47i4L54p8dqYCJJZuv2s3tqlXQ0fvl6Zp2xrblELPVfxmjnc0eurx3XwfQdaqm3T6uls6tQKkof/4QMw==",
 			"engines": {
 				"node": ">=4.0.0"
 			}
 		},
 		"node_modules/angular": {
-			"version": "1.8.2",
+			"version": "1.8.3",
-			"license": "MIT"
+			"resolved": "https://registry.npmjs.org/angular/-/angular-1.8.3.tgz",
+			"integrity": "sha512-5qjkWIQQVsHj4Sb5TcEs4WZWpFeVFHXwxEBHUhrny41D8UrBAd6T/6nPPAsLngJCReIOqi95W3mxdveveutpZw==",
+			"deprecated": "For the actively supported Angular, see https://www.npmjs.com/package/@angular/core. AngularJS support has officially ended. For extended AngularJS support options, see https://goo.gle/angularjs-path-forward."
 		},
 		"node_modules/angular-animate": {
 			"version": "1.8.2",
@@ -62,8 +66,9 @@
 			}
 		},
 		"node_modules/angular-translate": {
-			"version": "2.18.4",
+			"version": "2.19.0",
-			"license": "MIT",
+			"resolved": "https://registry.npmjs.org/angular-translate/-/angular-translate-2.19.0.tgz",
+			"integrity": "sha512-Z/Fip5uUT2N85dPQ0sMEe1JdF5AehcDe4tg/9mWXNDVU531emHCg53ZND9Oe0dyNiGX5rWcJKmsL1Fujus1vGQ==",
 			"dependencies": {
 				"angular": "^1.8.0"
 			},
@@ -72,10 +77,11 @@
 			}
 		},
 		"node_modules/angular-translate-loader-partial": {
-			"version": "2.18.4",
+			"version": "2.19.0",
-			"license": "MIT",
+			"resolved": "https://registry.npmjs.org/angular-translate-loader-partial/-/angular-translate-loader-partial-2.19.0.tgz",
+			"integrity": "sha512-NnMw13LMV4bPQmJK7/pZOZAnPxe0M5OtUHchADs5Gye7V7feonuEnrZ8e1CKhBlv9a7IQyWoqcBa4Lnhg8gk5w==",
 			"dependencies": {
-				"angular-translate": "~2.18.4"
+				"angular-translate": "~2.19.0"
 			}
 		},
 		"node_modules/argparse": {
@@ -119,8 +125,9 @@
 			}
 		},
 		"node_modules/moment": {
-			"version": "2.29.1",
+			"version": "2.29.4",
-			"license": "MIT",
+			"resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
+			"integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
 			"engines": {
 				"node": "*"
 			}
@@ -164,16 +171,22 @@
 	},
 	"dependencies": {
 		"@uirouter/angularjs": {
-			"version": "1.0.29",
+			"version": "1.0.30",
+			"resolved": "https://registry.npmjs.org/@uirouter/angularjs/-/angularjs-1.0.30.tgz",
+			"integrity": "sha512-qkc3RFZc91S5K0gc/QVAXc9LGDPXjR04vDgG/11j8+yyZEuQojXxKxdLhKIepiPzqLmGRVqzBmBc27gtqaEeZg==",
 			"requires": {
-				"@uirouter/core": "6.0.7"
+				"@uirouter/core": "6.0.8"
 			}
 		},
 		"@uirouter/core": {
-			"version": "6.0.7"
+			"version": "6.0.8",
+			"resolved": "https://registry.npmjs.org/@uirouter/core/-/core-6.0.8.tgz",
+			"integrity": "sha512-Gc/BAW47i4L54p8dqYCJJZuv2s3tqlXQ0fvl6Zp2xrblELPVfxmjnc0eurx3XwfQdaqm3T6uls6tQKkof/4QMw=="
 		},
 		"angular": {
-			"version": "1.8.2"
+			"version": "1.8.3",
+			"resolved": "https://registry.npmjs.org/angular/-/angular-1.8.3.tgz",
+			"integrity": "sha512-5qjkWIQQVsHj4Sb5TcEs4WZWpFeVFHXwxEBHUhrny41D8UrBAd6T/6nPPAsLngJCReIOqi95W3mxdveveutpZw=="
 		},
 		"angular-animate": {
 			"version": "1.8.2"
@@ -185,15 +198,19 @@
 			}
 		},
 		"angular-translate": {
-			"version": "2.18.4",
+			"version": "2.19.0",
+			"resolved": "https://registry.npmjs.org/angular-translate/-/angular-translate-2.19.0.tgz",
+			"integrity": "sha512-Z/Fip5uUT2N85dPQ0sMEe1JdF5AehcDe4tg/9mWXNDVU531emHCg53ZND9Oe0dyNiGX5rWcJKmsL1Fujus1vGQ==",
 			"requires": {
 				"angular": "^1.8.0"
 			}
 		},
 		"angular-translate-loader-partial": {
-			"version": "2.18.4",
+			"version": "2.19.0",
+			"resolved": "https://registry.npmjs.org/angular-translate-loader-partial/-/angular-translate-loader-partial-2.19.0.tgz",
+			"integrity": "sha512-NnMw13LMV4bPQmJK7/pZOZAnPxe0M5OtUHchADs5Gye7V7feonuEnrZ8e1CKhBlv9a7IQyWoqcBa4Lnhg8gk5w==",
 			"requires": {
-				"angular-translate": "~2.18.4"
+				"angular-translate": "~2.19.0"
 			}
 		},
 		"argparse": {
@@ -222,7 +239,9 @@
 			}
 		},
 		"moment": {
-			"version": "2.29.1"
+			"version": "2.29.4",
+			"resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
+			"integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="
 		},
 		"oclazyload": {
 			"version": "0.6.3"

loopback/locale/es.json

@@ -239,5 +239,6 @@
 	"This route does not exists": "Esta ruta no existe",
     "Claim pickup order sent": "Reclamación Orden de recogida enviada [({{claimId}})]({{{claimUrl}}}) al cliente *{{clientName}}*",
     "You don't have grant privilege": "No tienes privilegios para dar privilegios",
-    "You don't own the role and you can't assign it to another user": "No eres el propietario del rol y no puedes asignarlo a otro usuario"
+    "You don't own the role and you can't assign it to another user": "No eres el propietario del rol y no puedes asignarlo a otro usuario",
+	"Empty data source": "Origen de datos vacio"
 }

modules/client/back/methods/receipt/balanceCompensationEmail.js

@@ -0,0 +1,40 @@
+const {Email} = require('vn-print');
+
+module.exports = Self => {
+    Self.remoteMethodCtx('balanceCompensationEmail', {
+        description: 'Sends the debit balances compensation email with an attached PDF',
+        accessType: 'WRITE',
+        accepts: [
+            {
+                arg: 'id',
+                type: 'Number',
+                required: true,
+                description: 'The receipt id',
+                http: { source: 'path' }
+            }
+        ],
+        returns: {
+            type: ['object'],
+            root: true
+        },
+        http: {
+            path: '/:id/balance-compensation-email',
+            verb: 'POST'
+        }
+    });
+
+    Self.balanceCompensationEmail = async (ctx, id) => {
+
+        const models = Self.app.models;
+        const receipt = await models.Receipt.findById(id, {fields: ['clientFk']});
+        const client = await models.Client.findById(receipt.clientFk, {fields:['email']});
+
+        const email = new Email('balance-compensation', {
+            lang: ctx.req.getLocale(),
+            recipient: client.email+',administracion@verdnatura.es',
+            id
+        });
+
+        return email.send();
+    };
+};

modules/client/back/methods/receipt/balanceCompensationPdf.js

@@ -0,0 +1,50 @@
+const { Report } = require('vn-print');
+
+module.exports = Self => {
+    Self.remoteMethodCtx('balanceCompensationPdf', {
+        description: 'Returns the the debit balances compensation pdf',
+        accessType: 'READ',
+        accepts: [
+            {
+                arg: 'id',
+                type: 'number',
+                required: true,
+                description: 'The receipt id',
+                http: { source: 'path' }
+            }
+        ],
+        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/balance-compensation-pdf',
+            verb: 'GET'
+        }
+    });
+
+    Self.balanceCompensationPdf = async(ctx, id) => {
+        const args = Object.assign({}, ctx.args);
+        const params = {lang: ctx.req.getLocale()};
+
+        delete args.ctx;
+        for (const param in args)
+            params[param] = args[param];
+
+        const report = new Report('balance-compensation', params);
+        const stream = await report.toPdfStream();
+
+        return [stream, 'application/pdf', `filename="doc-${id}.pdf"`];
+    };
+};

modules/client/back/models/receipt.js

@@ -2,6 +2,8 @@ const LoopBackContext = require('loopback-context');
 
 module.exports = function(Self) {
     require('../methods/receipt/filter')(Self);
+    require('../methods/receipt/balanceCompensationEmail')(Self);
+    require('../methods/receipt/balanceCompensationPdf')(Self);
     require('../methods/receipt/receiptPdf')(Self);
 
     Self.validateBinded('amountPaid', isNotZero, {

modules/client/front/balance/index/index.html

@@ -121,6 +121,19 @@
                             </vn-icon-button>
                         </a>
                     </vn-td>
+                        <vn-td center shrink ng-if="!balance.isInvoice">
+                            <vn-icon-button
+                                vn-dialog="send_compensation"
+                                icon="outgoing_mail"
+                                title="{{'Send compensation' | translate}}">
+                            </vn-icon-button>
+                        </vn-td>
+                        <vn-confirm
+                            vn-id="send_compensation"
+                            on-accept="$ctrl.sendEmail(balance)"
+                            question="Notify compensation"
+                            message="Send compensation">
+                        </vn-confirm>
                     </vn-tr>
                 </vn-tbody>
             </vn-table>

modules/client/front/balance/index/index.js

@@ -2,8 +2,9 @@ import ngModule from '../../module';
 import Section from 'salix/components/section';
 
 class Controller extends Section {
-    constructor($element, $) {
+    constructor($element, $, vnEmail) {
         super($element, $);
+        this.vnEmail = vnEmail;
         this.filter = {
             include: {
                 relation: 'company',
@@ -90,9 +91,13 @@ class Controller extends Section {
         this.$http.patch(endpoint, params)
         .then(() => this.vnApp.showSuccess(this.$t('Data saved!')));
     }
+
+    sendEmail(balance) {
+        return this.vnEmail.send(`Receipts/${balance.id}/balance-compensation-email`);
+    }
 }
 
-Controller.$inject = ['$element', '$scope'];
+Controller.$inject = ['$element', '$scope', 'vnEmail'];
 
 ngModule.vnComponent('vnClientBalanceIndex', {
     template: require('./index.html'),

modules/client/front/balance/index/locale/es.yml

@@ -8,4 +8,6 @@ Havings: Haber
 Balance: Balance
 Total by company: Total por empresa
 Download PDF: Descargar PDF
+Send compensation: Enviar compensación
 BILL: N/FRA {{ref}}
+Notify compensation: ¿Desea informar de la compensación al cliente por correo?

modules/entry/front/buy/index/index.html

@@ -91,7 +91,7 @@
                                 url="Packagings"
                                 show-field="id"
                                 value-field="id"
-                                where="{isBox: true}"
+                                where="{freightItemFk: true}"
                                 ng-model="buy.packageFk"
                                 on-change="$ctrl.saveBuy(buy)">
                             </vn-autocomplete>

modules/ticket/back/methods/expedition/filter.js

@@ -32,7 +32,7 @@ module.exports = Self => {
             `SELECT 
                 e.id,
                 e.ticketFk,
-                e.isBox,
+                e.freightItemFk,
                 e.workerFk,
                 i1.name packageItemName,
                 e.counter,
@@ -51,7 +51,7 @@ module.exports = Self => {
             FROM vn.expedition e
                 LEFT JOIN vn.expeditionStateType est ON est.id = e.stateTypeFk 
                 LEFT JOIN vn.item i2 ON i2.id = e.itemFk
-                INNER JOIN vn.item i1 ON i1.id = e.isBox
+                INNER JOIN vn.item i1 ON i1.id = e.freightItemFk
                 LEFT JOIN vn.packaging p ON p.id = e.packagingFk
                 LEFT JOIN vn.item i3 ON i3.id = p.itemFk
                 LEFT JOIN account.user u ON u.id = e.workerFk

modules/ticket/back/methods/ticket/collectionLabel.js

@@ -0,0 +1,50 @@
+const {Report} = require('vn-print');
+
+module.exports = Self => {
+    Self.remoteMethodCtx('collectionLabel', {
+        description: 'Returns the collection label',
+        accessType: 'READ',
+        accepts: [
+            {
+                arg: 'id',
+                type: 'number',
+                required: true,
+                description: 'The ticket id',
+                http: {source: 'path'}
+            },
+        ],
+        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/collection-label',
+            verb: 'GET'
+        }
+    });
+
+    Self.collectionLabel = async(ctx, id) => {
+        const args = Object.assign({}, ctx.args);
+        const params = {lang: ctx.req.getLocale()};
+
+        delete args.ctx;
+        for (const param in args)
+            params[param] = args[param];
+
+        const report = new Report('collection-label', params);
+        const stream = await report.toPdfStream();
+
+        return [stream, 'application/pdf', `filename="doc-${id}.pdf"`];
+    };
+};

modules/ticket/back/models/expedition.json

@@ -16,7 +16,7 @@
         "type": "number",
         "description": "Identifier"
       },
-      "isBox": {
+      "freightItemFk": {
         "type": "number"
       },
       "created": {
@@ -55,7 +55,7 @@
       "freightItem": {
         "type": "belongsTo",
         "model": "Item",
-        "foreignKey": "isBox"
+        "foreignKey": "freightItemFk"
       },
       "packaging": {
         "type": "belongsTo",

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

@@ -33,4 +33,5 @@ module.exports = function(Self) {
     require('../methods/ticket/closeByTicket')(Self);
     require('../methods/ticket/closeByAgency')(Self);
     require('../methods/ticket/closeByRoute')(Self);
+    require('../methods/ticket/collectionLabel')(Self);
 };

package.json

@@ -42,7 +42,7 @@
         "puppeteer": "^18.0.5",
         "read-chunk": "^3.2.0",
         "require-yaml": "0.0.1",
-        "sharp": "^0.31.0",
+        "sharp": "^0.31.2",
         "smbhash": "0.0.1",
         "strong-error-handler": "^2.3.2",
         "uuid": "^3.3.3",
@@ -80,7 +80,7 @@
         "html-loader-jest": "^0.2.1",
         "html-webpack-plugin": "^4.0.0-beta.11",
         "identity-obj-proxy": "^3.0.0",
-        "jasmine": "^4.1.0",
+        "jasmine": "^4.5.0",
         "jasmine-reporters": "^2.4.0",
         "jasmine-spec-reporter": "^7.0.0",
         "jest": "^26.0.1",

print/core/components/email-body/assets/css/import.js

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

print/core/components/email-body/email-body.html

@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html v-bind:lang="$i18n.locale">
+    <head>
+        <meta name="viewport" content="width=device-width" />
+        <meta name="format-detection" content="telephone=no" />
+    </head>
+
+    <body>
+        <table class="grid">
+            <tbody>
+                <tr>
+                    <td>
+                        <div class="grid-row">
+                            <div class="grid-block empty"></div>
+                        </div>
+                        <slot name="header">
+                            <div class="grid-row">
+                                <div class="grid-block">
+                                    <email-header v-bind="$props"></email-header>
+                                </div>
+                            </div>
+                        </slot>
+                        <slot></slot>
+                        <slot name="footer">
+                            <div class="grid-row">
+                                <div class="grid-block">
+                                    <email-footer v-bind="$props"></email-footer>
+                                </div>
+                            </div>
+                        </slot>
+                        <div class="grid-row">
+                            <div class="grid-block empty"></div>
+                        </div>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </body>
+</html>

print/core/components/email-body/email-body.js

@@ -0,0 +1,12 @@
+
+const Component = require(`vn-print/core/component`);
+const emailHeader = new Component('email-header');
+const emailFooter = new Component('email-footer');
+
+module.exports = {
+    components: {
+        'email-header': emailHeader.build(),
+        'email-footer': emailFooter.build()
+    },
+    name: 'email-body',
+};

print/core/components/email-footer/email-footer.html

@@ -3,7 +3,7 @@
     <div class="buttons">
         <div class="columns">
             <div class="size50">
-                <a href="https://www.verdnatura.es" target="_blank">
+                <a href="https://verdnatura.es" target="_blank">
                     <div class="btn">
                         <!-- <span class="icon vn-pa-sm"><img v-bind:src="getEmailSrc('action.png')"/></span> -->
                         <span class="text vn-pa-sm">{{ $t('buttons.webAcccess')}}</span>

print/core/components/email-footer/locale/en.yml

@@ -2,7 +2,7 @@ buttons:
   webAcccess: Visit our website
   info: Help us to improve
 fiscalAddress: VERDNATURA LEVANTE SL, B97367486 C/ Fenollar, 2. 46680 ALGEMESI
-  · www.verdnatura.es · clientes@verdnatura.es
+  · verdnatura.es · clientes@verdnatura.es
 disclaimer: '- NOTICE - This message is private and confidential, and should be used 
   exclusively by the person receiving it. If you have received this message by mistake, 
   please notify the sender and delete that message and any attached documents that it may contain. 

print/core/components/email-footer/locale/es.yml

@@ -2,7 +2,7 @@ buttons:
   webAcccess: Visita nuestra Web
   info: Ayúdanos a mejorar
 fiscalAddress: VERDNATURA LEVANTE SL, B97367486 C/ Fenollar, 2. 46680 ALGEMESI
-  · www.verdnatura.es · clientes@verdnatura.es
+  · verdnatura.es · clientes@verdnatura.es
 disclaimer: '- AVISO - Este mensaje es privado y confidencial, y debe ser utilizado
   exclusivamente por la persona destinataria del mismo. Si has recibido este mensaje
   por error, te rogamos lo comuniques al remitente y borres dicho mensaje y cualquier

print/core/components/email-footer/locale/fr.yml

@@ -2,7 +2,7 @@ buttons:
   webAcccess: Visitez notre site web
   info: Aidez-nous à améliorer
 fiscalAddress: VERDNATURA LEVANTE SL, B97367486 C/ Fenollar, 2. 46680 ALGEMESI
-  · www.verdnatura.es · clientes@verdnatura.es
+  · verdnatura.es · clientes@verdnatura.es
 disclaimer: "- AVIS - Ce message est privé et confidentiel et doit être utilisé 
   exclusivement par le destinataire. Si vous avez reçu ce message par erreur, 
   veuillez en informer l'expéditeur et supprimer ce message ainsi que tous les 

print/core/components/email-footer/locale/pt.yml

@@ -2,7 +2,7 @@ buttons:
   webAcccess: Visite o nosso site
   info: Ajude-nos a melhorar
 fiscalAddress: VERDNATURA LEVANTE SL, B97367486 C/ Fenollar, 2. 46680 ALGEMESI
-  · www.verdnatura.es · clientes@verdnatura.es
+  · verdnatura.es · clientes@verdnatura.es
 disclaimer: '- AVISO - Esta mensagem é privada e confidencial e deve ser usada exclusivamente 
   pela pessoa que a recebe. Se você recebeu esta mensagem por engano, notifique o remetente e 
   exclua essa mensagem e todos os documentos anexos que ela possa conter. 

print/core/components/email-header/email-header.html

@@ -1,7 +1,7 @@
 <header>
     <div class="logo">
-        <a href="https://www.verdnatura.es" target="_blank">
+        <a href="https://verdnatura.es" target="_blank">
-            <img v-bind:src="getEmailSrc('logo-black.png')" alt="VerdNatura"/>
+            <img v-bind:src="getEmailSrc('logo-black.png')" alt="VerdNatura" />
         </a>
     </div>
     <div class="topbar"></div>

print/core/components/report-body/assets/css/import.js

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

print/core/components/report-body/report-body.html

@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html v-bind:lang="$i18n.locale">
+    <body>
+        <table class="grid">
+            <tbody>
+                <tr>
+                    <td>
+                        <slot name="header">
+                            <report-header v-bind="$props"></report-header>
+                        </slot>
+                        <slot></slot>
+                        <slot name="footer">
+                            <report-footer id="pageFooter" v-bind="$props"></report-footer>
+                        </slot>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </body>
+</html>

print/core/components/report-body/report-body.js

@@ -0,0 +1,12 @@
+
+const Component = require(`vn-print/core/component`);
+const reportHeader = new Component('report-header');
+const reportFooter = new Component('report-footer');
+
+module.exports = {
+    name: 'report-body',
+    components: {
+        'report-header': reportHeader.build(),
+        'report-footer': reportFooter.build()
+    },
+};

print/core/components/report-header/locale/en.yml

@@ -1,2 +1,2 @@
 company:
-  contactData: www.verdnatura.es - clientes@verdnatura.es
+  contactData: verdnatura.es - clientes@verdnatura.es

print/core/components/report-header/locale/es.yml

@@ -1,2 +1,2 @@
 company:
-  contactData: www.verdnatura.es - clientes@verdnatura.es
+  contactData: verdnatura.es - clientes@verdnatura.es

print/core/components/report-header/locale/fr.yml

@@ -1,2 +1,2 @@
 company:
-  contactData: www.verdnatura.es - clientes@verdnatura.es
+  contactData: verdnatura.es - clientes@verdnatura.es

print/core/components/report-header/locale/pt.yml

@@ -1,2 +1,2 @@
 company:
-  contactData: · www.verdnatura.es · clientes@verdnatura.es
+  contactData: · verdnatura.es · clientes@verdnatura.es

print/core/email.js

@@ -32,7 +32,7 @@ class Email extends Component {
         const rendered = await this.render();
         const attachments = [];
         const getAttachments = async(componentPath, files) => {
-            for (file of files) {
+            for (const file of files) {
                 const fileCopy = Object.assign({}, file);
                 const fileName = fileCopy.filename;
 
@@ -54,14 +54,21 @@ class Email extends Component {
             }
         };
 
+        async function getSubcomponentAttachments(instance) {
             if (instance.components) {
                 const components = instance.components;
                 for (let componentName in components) {
                     const component = components[componentName];
                     const componentPath = `./components/${componentName}`;
                     await getAttachments(componentPath, component.attachments);
+
+                    if (component.components)
+                        await getSubcomponentAttachments(component)
                 }
             }
+        }
+
+        await getSubcomponentAttachments(instance)
 
         if (this.attachments)
             await getAttachments(this.path, this.attachments);

print/templates/email/balance-compensation/assets/css/import.js

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

print/templates/email/balance-compensation/attachments.json

@@ -0,0 +1,6 @@
+[
+    {
+        "filename": "balance-compensation.pdf",
+        "component": "balance-compensation"
+    }
+]

print/templates/email/balance-compensation/balance-compensation.html

@@ -0,0 +1,17 @@
+<email-body v-bind="$props">
+    <div class="grid-row">
+        <div class="grid-block vn-pa-ml">
+            <p>{{$t('description.instructions')}} {{client.name}}</p>
+            <p>{{$t('description.attached')}}</p>
+            <p>{{$t('description.response')}}</p>
+            <p>{{$t('description.regards')}}</p>
+        </div>
+    </div>
+    <div class="grid-row" v-if="isPreview">
+        <div class="grid-block vn-pa-ml">
+            <attachment v-for="attachment in attachments" v-bind:key="attachment.filename"
+                v-bind:attachment="attachment" v-bind:args="$props">
+            </attachment>
+        </div>
+    </div>
+</email-body>

print/templates/email/balance-compensation/balance-compensation.js

@@ -0,0 +1,36 @@
+const Component = require(`vn-print/core/component`);
+const emailBody = new Component('email-body');
+const attachment = new Component('attachment');
+
+module.exports = {
+    name: 'balance-compensation',
+    async serverPrefetch() {
+        this.client = await this.fetchClient(this.id);
+    },
+    methods: {
+        fetchClient(id) {
+            return this.findOneFromDef('client', [id]);
+        },
+    },
+    components: {
+        'email-body': emailBody.build(),
+        'attachment': attachment.build()
+    },
+    data() {
+        return {
+            attachments: [
+                {
+                    filename: 'balance-compensation.pdf',
+                    type: 'pdf',
+                    path: `Receipts/${this.id}/balance-compensation-pdf`
+                }
+            ]
+        };
+    },
+    props: {
+        id: {
+            type: Number,
+            required: true
+        }
+    }
+};

print/templates/email/balance-compensation/locale/es.yml

@@ -0,0 +1,6 @@
+subject: Compensación VerdNatura SL
+description:
+  instructions:  Buenos días,
+  attached: Adjuntamos escrito para su confirmación
+  response: Rogamos su respuesta a la mayor brevedad
+  regards: Un saludo

print/templates/email/balance-compensation/sql/client.sql

@@ -0,0 +1,5 @@
+SELECT 
+    c.name 
+FROM client c
+    JOIN receipt r ON r.clientFk = c.id 
+WHERE r.id = ?;

print/templates/email/buyer-week-waste/buyer-week-waste.html

@@ -1,26 +1,4 @@
-<!DOCTYPE html>
+<email-body v-bind="$props">
-<html v-bind:lang="$i18n.locale">
-    <head>
-        <meta name="viewport" content="width=device-width">
-        <meta name="format-detection" content="telephone=no">
-        <title>{{ $t('subject') }}</title>
-    </head>
-    <body>
-        <table class="grid">
-            <tbody>
-                <tr>
-                    <td>
-                        <!-- Empty block -->
-                        <div class="grid-row">
-                            <div class="grid-block empty"></div>
-                        </div>
-                        <!-- Header block -->
-                        <div class="grid-row">
-                            <div class="grid-block">
-                                <email-header v-bind="$props"></email-header>
-                            </div>
-                        </div>
-                        <!-- Block -->
     <div class="grid-row">
         <div class="grid-block vn-pa-ml">
             <h1>{{ $t('title') }}</h1>
@@ -28,7 +6,6 @@
             <p v-html="$t('description', [dated])"></p>
         </div>
     </div>
-                        <!-- Block -->
     <div class="grid-row">
         <div class="grid-block vn-pa-ml">
             <table class="column-oriented">
@@ -57,20 +34,4 @@
             </div>
         </div>
     </div>
-
+</email-body>
-                        <!-- Footer block -->
-                        <div class="grid-row">
-                            <div class="grid-block">
-                                <email-footer v-bind="$props"></email-footer>
-                            </div>
-                        </div>
-                        <!-- Empty block -->
-                        <div class="grid-row">
-                            <div class="grid-block empty"></div>
-                        </div>
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-    </body>
-</html>

print/templates/email/buyer-week-waste/buyer-week-waste.js

@@ -1,6 +1,5 @@
 const Component = require(`vn-print/core/component`);
-const emailHeader = new Component('email-header');
+const emailBody = new Component('email-body');
-const emailFooter = new Component('email-footer');
 
 module.exports = {
     name: 'buyer-week-waste',
@@ -23,8 +22,7 @@ module.exports = {
         }
     },
     components: {
-        'email-header': emailHeader.build(),
+        'email-body': emailBody.build()
-        'email-footer': emailFooter.build()
     },
     props: {}
 };

print/templates/email/campaign-metrics/campaign-metrics.html

@@ -1,26 +1,4 @@
-<!DOCTYPE html>
+<email-body v-bind="$props">
-<html v-bind:lang="$i18n.locale">
-    <head>
-        <meta name="viewport" content="width=device-width">
-        <meta name="format-detection" content="telephone=no">
-        <title>{{ $t('subject') }}</title>
-    </head>
-    <body>
-        <table class="grid">
-            <tbody>
-                <tr>
-                    <td>
-                        <!-- Empty block -->
-                        <div class="grid-row">
-                            <div class="grid-block empty"></div>
-                        </div>
-                        <!-- Header block -->
-                        <div class="grid-row">
-                            <div class="grid-block">
-                                <email-header v-bind="$props"></email-header>
-                            </div>
-                        </div>
-                        <!-- Block -->
     <div class="grid-row">
         <div class="grid-block vn-pa-ml">
             <h1>{{ $t('title') }}</h1>
@@ -28,19 +6,4 @@
             <p v-html="$t('description', [minDate, maxDate])"></p>
         </div>
     </div>
-                        <!-- Footer block -->
+</email-body>
-                        <div class="grid-row">
-                            <div class="grid-block">
-                                <email-footer v-bind="$props"></email-footer>
-                            </div>
-                        </div>
-                        <!-- Empty block -->
-                        <div class="grid-row">
-                            <div class="grid-block empty"></div>
-                        </div>
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-    </body>
-</html>

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

@@ -1,6 +1,5 @@
 const Component = require(`vn-print/core/component`);
-const emailHeader = new Component('email-header');
+const emailBody = new Component('email-body');
-const emailFooter = new Component('email-footer');
 
 module.exports = {
     name: 'campaign-metrics',
@@ -16,8 +15,7 @@ module.exports = {
         }
     },
     components: {
-        'email-header': emailHeader.build(),
+        'email-body': emailBody.build(),
-        'email-footer': emailFooter.build()
     },
     props: {
         id: {

print/templates/email/claim-pickup-order/claim-pickup-order.html

@@ -1,26 +1,4 @@
-<!DOCTYPE html>
+<email-body v-bind="$props">
-<html v-bind:lang="$i18n.locale">
-    <head>
-        <meta name="viewport" content="width=device-width">
-        <meta name="format-detection" content="telephone=no">
-        <title>{{ $t('subject') }}</title>
-    </head>
-    <body>
-        <table class="grid">
-            <tbody>
-                <tr>
-                    <td>
-                        <!-- Empty block -->
-                        <div class="grid-row">
-                            <div class="grid-block empty"></div>
-                        </div>
-                        <!-- Header block -->
-                        <div class="grid-row">
-                            <div class="grid-block">
-                                <email-header v-bind="$props"></email-header>
-                            </div>
-                        </div>
-                        <!-- Block -->
     <div class="grid-row">
         <div class="grid-block vn-pa-ml">
             <h1>{{ $t('title', [id]) }}</h1>
@@ -29,19 +7,4 @@
             <p>{{ $t('description.conclusion') }}</p>
         </div>
     </div>
-                        <!-- Footer block -->
+</email-body>
-                        <div class="grid-row">
-                            <div class="grid-block">
-                                <email-footer v-bind="$props"></email-footer>
-                            </div>
-                        </div>
-                        <!-- Empty block -->
-                        <div class="grid-row">
-                            <div class="grid-block empty"></div>
-                        </div>
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-    </body>
-</html>

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

@@ -1,12 +1,10 @@
 const Component = require(`vn-print/core/component`);
-const emailHeader = new Component('email-header');
+const emailBody = new Component('email-body');
-const emailFooter = new Component('email-footer');
 
 module.exports = {
     name: 'claim-pickup-order',
     components: {
-        'email-header': emailHeader.build(),
+        'email-body': emailBody.build(),
-        'email-footer': emailFooter.build()
     },
     async serverPrefetch() {
         this.ticket = await this.fetchTicket(this.id);

print/templates/email/client-debt-statement/attachments.json

@@ -0,0 +1,6 @@
+[
+    {
+        "filename": "client-debt-statement.pdf",
+        "component": "client-debt-statement"
+    }
+]

print/templates/email/client-debt-statement/client-debt-statement.html

@@ -1,55 +1,15 @@
-<!DOCTYPE html>
+<email-body v-bind="$props">
-<html v-bind:lang="$i18n.locale">
-    <head>
-        <meta name="viewport" content="width=device-width">
-        <meta name="format-detection" content="telephone=no">
-        <title>{{ $t('subject') }}</title>
-    </head>
-    <body>
-        <table class="grid">
-            <tbody>
-                <tr>
-                    <td>
-                        <!-- Empty block -->
-                        <div class="grid-row">
-                            <div class="grid-block empty"></div>
-                        </div>
-                        <!-- Header block -->
-                        <div class="grid-row">
-                            <div class="grid-block">
-                                <email-header v-bind="$props"></email-header>
-                            </div>
-                        </div>
-                        <!-- Block -->
     <div class="grid-row">
         <div class="grid-block vn-pa-ml">
             <h1>{{ $t('title') }}</h1>
             <p>{{$t('description.instructions')}}</p>
         </div>
     </div>
-                        <!-- Preview block -->
     <div class="grid-row" v-if="isPreview">
         <div class="grid-block vn-pa-ml">
-                                <attachment v-for="attachment in attachments" 
+            <attachment v-for="attachment in attachments" v-bind:key="attachment.filename"
-                                    v-bind:key="attachment.filename"
+                v-bind:attachment="attachment" v-bind:args="$props">
-                                    v-bind:attachment="attachment"
-                                    v-bind:args="$props">
             </attachment>
         </div>
     </div>
-                        <!-- Footer block -->
+</email-body>
-                        <div class="grid-row">
-                            <div class="grid-block">
-                                <email-footer v-bind="$props"></email-footer>
-                            </div>
-                        </div>
-                        <!-- Empty block -->
-                        <div class="grid-row">
-                            <div class="grid-block empty"></div>
-                        </div>
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-    </body>
-</html>

print/templates/email/client-debt-statement/client-debt-statement.js

@@ -1,13 +1,11 @@
 const Component = require(`vn-print/core/component`);
-const emailHeader = new Component('email-header');
+const emailBody = new Component('email-body');
-const emailFooter = new Component('email-footer');
 const attachment = new Component('attachment');
 
 module.exports = {
     name: 'client-debt-statement',
     components: {
-        'email-header': emailHeader.build(),
+        'email-body': emailBody.build(),
-        'email-footer': emailFooter.build(),
         'attachment': attachment.build()
     },
     data() {

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

@@ -1,26 +1,4 @@
-<!DOCTYPE html>
+<email-body v-bind="$props">
-<html v-bind:lang="$i18n.locale">
-    <head>
-        <meta name="viewport" content="width=device-width">
-        <meta name="format-detection" content="telephone=no">
-        <title>{{ $t('subject') }}</title>
-    </head>
-    <body>
-        <table class="grid">
-            <tbody>
-                <tr>
-                    <td>
-                        <!-- Empty block -->
-                        <div class="grid-row">
-                            <div class="grid-block empty"></div>
-                        </div>
-                        <!-- Header block -->
-                        <div class="grid-row">
-                            <div class="grid-block">
-                                <email-header v-bind="$props"></email-header>
-                            </div>
-                        </div>
-                        <!-- Block -->
     <div class="grid-row">
         <div class="grid-block vn-pa-ml">
             <h1>{{ $t('title') }}</h1>
@@ -69,24 +47,10 @@
             </section>
             <section v-if="client.salesPersonEmail">
                 {{$t('salesPersonEmail')}}:
-                                        <strong><a v-bind:href="`mailto: ${client.salesPersonEmail}`" target="_blank">{{client.salesPersonEmail}}</strong>
+                <strong><a v-bind:href="`mailto: ${client.salesPersonEmail}`"
+                        target="_blank">{{client.salesPersonEmail}}</strong>
             </section>
             </p>
         </div>
     </div>
-                        <!-- Footer block -->
+</email-body>
-                        <div class="grid-row">
-                            <div class="grid-block">
-                                <email-footer v-bind="$props"></email-footer>
-                            </div>
-                        </div>
-                        <!-- Empty block -->
-                        <div class="grid-row">
-                            <div class="grid-block empty"></div>
-                        </div>
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-    </body>
-</html>

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

@@ -1,6 +1,5 @@
 const Component = require(`vn-print/core/component`);
-const emailHeader = new Component('email-header');
+const emailBody = new Component('email-body');
-const emailFooter = new Component('email-footer');
 
 module.exports = {
     name: 'client-welcome',
@@ -13,8 +12,7 @@ module.exports = {
         },
     },
     components: {
-        'email-header': emailHeader.build(),
+        'email-body': emailBody.build(),
-        'email-footer': emailFooter.build()
     },
     props: {
         id: {

print/templates/email/client-welcome/locale/es.yml

@@ -1,8 +1,8 @@
 subject: Bienvenido a Verdnatura
 title: "¡Te damos la bienvenida!"
 dearClient: Estimado cliente
-clientData: 'Tus datos para poder comprar en la web de Verdnatura (<a href="https://www.verdnatura.es"
+clientData: 'Tus datos para poder comprar en la web de Verdnatura (<a href="https://verdnatura.es"
-	title="Visitar Verdnatura" target="_blank" style="color: #8dba25">https://www.verdnatura.es</a>)
+	title="Visitar Verdnatura" target="_blank" style="color: #8dba25">https://verdnatura.es</a>)
 	o en nuestras aplicaciones para <a href="https://goo.gl/3hC2mG" title="App Store"
 	target="_blank" style="color: #8dba25">iOS</a> y <a href="https://goo.gl/8obvLc"
 	title="Google Play" target="_blank" style="color: #8dba25">Android</a>, son'

print/templates/email/credit-request/credit-request.html

@@ -1,55 +1,15 @@
-<!DOCTYPE html>
+<email-body v-bind="$props">
-<html v-bind:lang="$i18n.locale">
-    <head>
-        <meta name="viewport" content="width=device-width">
-        <meta name="format-detection" content="telephone=no">
-        <title>{{ $t('subject') }}</title>
-    </head>
-    <body>
-        <table class="grid">
-            <tbody>
-                <tr>
-                    <td>
-                        <!-- Empty block -->
-                        <div class="grid-row">
-                            <div class="grid-block empty"></div>
-                        </div>
-                        <!-- Header block -->
-                        <div class="grid-row">
-                            <div class="grid-block">
-                                <email-header v-bind="$props"></email-header>
-                            </div>
-                        </div>
-                        <!-- Block -->
     <div class="grid-row">
         <div class="grid-block vn-pa-ml">
             <h1>{{ $t('title') }}</h1>
             <p>{{$t('description.instructions')}}</p>
         </div>
     </div>
-                        <!-- Preview block -->
     <div class="grid-row" v-if="isPreview">
         <div class="grid-block vn-pa-ml">
-                                <attachment v-for="attachment in attachments" 
+            <attachment v-for="attachment in attachments" v-bind:key="attachment.filename"
-                                    v-bind:key="attachment.filename"
+                v-bind:attachment="attachment" v-bind:args="$props">
-                                    v-bind:attachment="attachment"
-                                    v-bind:args="$props">
             </attachment>
         </div>
     </div>
-                        <!-- Footer block -->
+</email-body>
-                        <div class="grid-row">
-                            <div class="grid-block">
-                                <email-footer v-bind="$props"></email-footer>
-                            </div>
-                        </div>
-                        <!-- Empty block -->
-                        <div class="grid-row">
-                            <div class="grid-block empty"></div>
-                        </div>
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-    </body>
-</html>

print/templates/email/credit-request/credit-request.js

@@ -1,13 +1,11 @@
 const Component = require(`vn-print/core/component`);
-const emailHeader = new Component('email-header');
+const emailBody = new Component('email-body');
-const emailFooter = new Component('email-footer');
 const attachment = new Component('attachment');
 
 module.exports = {
     name: 'credit-request',
     components: {
-        'email-header': emailHeader.build(),
+        'email-body': emailBody.build(),
-        'email-footer': emailFooter.build(),
         'attachment': attachment.build()
     },
     data() {

print/templates/email/delivery-note-link/assets/css/style.css

@@ -3,3 +3,7 @@
     border-radius: 3px;
     text-align: center
 }
+
+a {
+    color: #8dba25
+}

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

@@ -1,31 +1,4 @@
-<!DOCTYPE html>
+<email-body v-bind="$props">
-<html v-bind:lang="$i18n.locale">
-    <head>
-        <meta name="viewport" content="width=device-width">
-        <meta name="format-detection" content="telephone=no">
-        <title>{{ $t('subject') }}</title>
-        <style type="text/css">
-        a {
-            color: #8dba25
-        }
-        </style>
-    </head>
-    <body>
-        <table class="grid">
-            <tbody>
-                <tr>
-                    <td>
-                        <!-- Empty block -->
-                        <div class="grid-row">
-                            <div class="grid-block empty"></div>
-                        </div>
-                        <!-- Header block -->
-                        <div class="grid-row">
-                            <div class="grid-block">
-                                <email-header v-bind="$props"></email-header>
-                            </div>
-                        </div>
-                        <!-- Block -->
     <div class="grid-row">
         <div class="grid-block vn-pa-ml">
             <h1>{{ $t('title') }}</h1>
@@ -33,16 +6,14 @@
             <p v-html="$t('description', [id])"></p>
         </div>
     </div>
-                        <!-- Block -->
     <div class="grid-row">
         <div class="grid-block vn-px-ml">
             <p>{{$t('copyLink')}}</p>
             <div class="external-link vn-pa-sm vn-m-md">
-                                    https://www.verdnatura.es/#!form=ecomerce/ticket&ticket={{id}}
+                https://shop.verdnatura.es/#!form=ecomerce/ticket&ticket={{id}}
             </div>
         </div>
     </div>
-                        <!-- Block -->
     <div class="grid-row">
         <div class="grid-block vn-pa-ml">
             <p v-html="$t('poll')"></p>
@@ -50,20 +21,4 @@
             <p v-html="$t('conclusion')"></p>
         </div>
     </div>
-
+</email-body>
-                        <!-- Footer block -->
-                        <div class="grid-row">
-                            <div class="grid-block">
-                                <email-footer v-bind="$props"></email-footer>
-                            </div>
-                        </div>
-                        <!-- Empty block -->
-                        <div class="grid-row">
-                            <div class="grid-block empty"></div>
-                        </div>
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-    </body>
-</html>

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

@@ -1,12 +1,10 @@
 const Component = require(`vn-print/core/component`);
-const emailHeader = new Component('email-header');
+const emailBody = new Component('email-body');
-const emailFooter = new Component('email-footer');
 
 module.exports = {
     name: 'delivery-note-link',
     components: {
-        'email-header': emailHeader.build(),
+        'email-body': emailBody.build(),
-        'email-footer': emailFooter.build()
     },
     props: {
         id: {

print/templates/email/delivery-note-link/locale/en.yml

@@ -2,7 +2,7 @@ subject: Your delivery note
 title: Your delivery note
 dear: Dear client
 description: The delivery note from the order <strong>{0}</strong> is now available. <br/>
-  You can download it by clicking <a href="https://www.verdnatura.es/#!form=ecomerce/ticket&ticket={0}">this link</a>.
+  You can download it by clicking <a href="https://shop.verdnatura.es/#!form=ecomerce/ticket&ticket={0}">this link</a>.
 copyLink: 'As an alternative, you can copy the following link in your browser:'
 poll: If you wish, you can answer our satisfaction survey to
   help us provide better service. Your opinion is very important for us!

print/templates/email/delivery-note-link/locale/es.yml

@@ -2,7 +2,7 @@ subject: Tu albarán
 title: Tu albarán
 dear: Estimado cliente
 description: Ya está disponible el albarán correspondiente al pedido <strong>{0}</strong>. <br/>
-  Puedes verlo haciendo clic <a href="https://www.verdnatura.es/#!form=ecomerce/ticket&ticket={0}">en este enlace</a>.
+  Puedes verlo haciendo clic <a href="https://shop.verdnatura.es/#!form=ecomerce/ticket&ticket={0}">en este enlace</a>.
 copyLink: 'Como alternativa, puedes copiar el siguiente enlace en tu navegador:'
 poll: Si lo deseas, puedes responder a nuestra encuesta de satisfacción para 
   ayudarnos a prestar un mejor servicio. ¡Tu opinión es muy importante para nosotros!

print/templates/email/delivery-note-link/locale/fr.yml

@@ -2,7 +2,7 @@ subject: Votre bon de livraison
 title: Votre bon de livraison
 dear: Cher client,
 description: Le bon de livraison correspondant à la commande <strong>{0}</strong> est maintenant disponible.<br/>
-  Vous pouvez le voir en cliquant <a href="https://www.verdnatura.es/#!form=ecomerce/ticket&ticket={0}" target="_blank">sur ce lien</a>.
+  Vous pouvez le voir en cliquant <a href="https://shop.verdnatura.es/#!form=ecomerce/ticket&ticket={0}" target="_blank">sur ce lien</a>.
 copyLink: 'Vous pouvez également copier le lien suivant dans votre navigateur:'
 poll: Si vous le souhaitez, vous pouvez répondre à notre questionaire de satisfaction 
   pour nous aider à améliorer notre service. Votre avis est très important pour nous!

print/templates/email/delivery-note-link/locale/pt.yml

@@ -2,7 +2,7 @@ subject: Sua nota de entrega
 title: Sua nota de entrega
 dear: Estimado cliente
 description: Já está disponível sua nota de entrega correspondente a encomenda numero <strong>{0}</strong>. <br/>
-  Para ver-lo faça um clique <a href="https://www.verdnatura.es/#!form=ecomerce/ticket&ticket={0}">neste link</a>.
+  Para ver-lo faça um clique <a href="https://shop.verdnatura.es/#!form=ecomerce/ticket&ticket={0}">neste link</a>.
 copyLink: 'Como alternativa, podes copiar o siguinte link no teu navegador:'
 poll: Si o deseja, podes responder nosso questionário de satiscação para ajudar-nos a prestar-vos um melhor serviço. Tua opinião é muito importante para nós!
 help: Cualquer dúvida que surja, no hesites em consultar-la, <strong>Estamos aqui para

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

@@ -1,26 +1,4 @@
-<!DOCTYPE html>
+<email-body v-bind="$props">
-<html v-bind:lang="$i18n.locale">
-    <head>
-        <meta name="viewport" content="width=device-width">
-        <meta name="format-detection" content="telephone=no">
-        <title>{{ $t('subject') }}</title>
-    </head>
-    <body>
-        <table class="grid">
-            <tbody>
-                <tr>
-                    <td>
-                        <!-- Empty block -->
-                        <div class="grid-row">
-                            <div class="grid-block empty"></div>
-                        </div>
-                        <!-- Header block -->
-                        <div class="grid-row">
-                            <div class="grid-block">
-                                <email-header v-bind="$props"></email-header>
-                            </div>
-                        </div>
-                        <!-- Block -->
     <div class="grid-row">
         <div class="grid-block vn-pa-ml">
             <h1>{{ $t('title') }}</h1>
@@ -31,19 +9,4 @@
             <p v-html="$t('conclusion')"></p>
         </div>
     </div>
-                        <!-- Footer block -->
+</email-body>
-                        <div class="grid-row">
-                            <div class="grid-block">
-                                <email-footer v-bind="$props"></email-footer>
-                            </div>
-                        </div>
-                        <!-- Empty block -->
-                        <div class="grid-row">
-                            <div class="grid-block empty"></div>
-                        </div>
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-    </body>
-</html>

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

@@ -1,12 +1,10 @@
 const Component = require(`vn-print/core/component`);
-const emailHeader = new Component('email-header');
+const emailBody = new Component('email-body');
-const emailFooter = new Component('email-footer');
 
 module.exports = {
     name: 'delivery-note',
     components: {
-        'email-header': emailHeader.build(),
+        'email-body': emailBody.build(),
-        'email-footer': emailFooter.build()
     },
     props: {
         id: {

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

@@ -1,45 +1,8 @@
-<!DOCTYPE html>
+<email-body v-bind="$props">
-<html v-bind:lang="$i18n.locale">
-    <head>
-        <meta name="viewport" content="width=device-width">
-        <meta name="format-detection" content="telephone=no">
-        <title>{{ $t('subject') }}</title>
-    </head>
-    <body>
-        <table class="grid">
-            <tbody>
-                <tr>
-                    <td>
-                        <!-- Empty block -->
-                        <div class="grid-row">
-                            <div class="grid-block empty"></div>
-                        </div>
-                        <!-- Header block -->
-                        <div class="grid-row">
-                            <div class="grid-block">
-                                <email-header v-bind="$props"></email-header>
-                            </div>
-                        </div>
-                        <!-- Block -->
     <div class="grid-row">
         <div class="grid-block vn-pa-ml">
             <h1>{{ $t('title') }}</h1>
             <p>{{$t('description.instructions')}}</p>
         </div>
     </div>
-                        <!-- Footer block -->
+</email-body>
-                        <div class="grid-row">
-                            <div class="grid-block">
-                                <email-footer v-bind="$props"></email-footer>
-                            </div>
-                        </div>
-                        <!-- Empty block -->
-                        <div class="grid-row">
-                            <div class="grid-block empty"></div>
-                        </div>
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-    </body>
-</html>

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

@@ -1,12 +1,10 @@
 const Component = require(`vn-print/core/component`);
-const emailHeader = new Component('email-header');
+const emailBody = new Component('email-body');
-const emailFooter = new Component('email-footer');
 
 module.exports = {
     name: 'driver-route',
     components: {
-        'email-header': emailHeader.build(),
+        'email-body': emailBody.build(),
-        'email-footer': emailFooter.build()
     },
     props: {
         id: {

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

@@ -1,26 +1,4 @@
-<!DOCTYPE html>
+<email-body v-bind="$props">
-<html v-bind:lang="$i18n.locale">
-    <head>
-        <meta name="viewport" content="width=device-width">
-        <meta name="format-detection" content="telephone=no">
-        <title>{{ $t('subject') }}</title>
-    </head>
-    <body>
-        <table class="grid">
-            <tbody>
-                <tr>
-                    <td>
-                        <!-- Empty block -->
-                        <div class="grid-row">
-                            <div class="grid-block empty"></div>
-                        </div>
-                        <!-- Header block -->
-                        <div class="grid-row">
-                            <div class="grid-block">
-                                <email-header v-bind="$props"></email-header>
-                            </div>
-                        </div>
-                        <!-- Block -->
     <div class="grid-row">
         <div class="grid-block vn-pa-ml">
             <h1>{{ $t('title') }}</h1>
@@ -29,29 +7,11 @@
             <p>{{$t('description.conclusion')}}</p>
         </div>
     </div>
-                        <!-- Attachments block -->
     <div class="grid-row" v-if="isPreview">
         <div class="grid-block vn-pa-ml">
-                                <attachment v-for="attachment in attachments" 
+            <attachment v-for="attachment in attachments" v-bind:key="attachment.filename"
-                                    v-bind:key="attachment.filename"
+                v-bind:attachment="attachment" v-bind:args="$props">
-                                    v-bind:attachment="attachment"
-                                    v-bind:args="$props">
             </attachment>
         </div>
     </div>
-                        <!-- Footer block -->
+</email-body>
-                        <div class="grid-row">
-                            <div class="grid-block">
-                                <email-footer v-bind="$props"></email-footer>
-                            </div>
-                        </div>
-                        <!-- Empty block -->
-                        <div class="grid-row">
-                            <div class="grid-block empty"></div>
-                        </div>
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-    </body>
-</html>

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

@@ -1,6 +1,5 @@
 const Component = require(`vn-print/core/component`);
-const emailHeader = new Component('email-header');
+const emailBody = new Component('email-body');
-const emailFooter = new Component('email-footer');
 const attachment = new Component('attachment');
 
 module.exports = {
@@ -17,8 +16,7 @@ module.exports = {
         };
     },
     components: {
-        'email-header': emailHeader.build(),
+        'email-body': emailBody.build(),
-        'email-footer': emailFooter.build(),
         'attachment': attachment.build()
     },
     props: {

print/templates/email/invoice/invoice.html

@@ -1,26 +1,4 @@
-<!DOCTYPE html>
+<email-body v-bind="$props">
-<html v-bind:lang="$i18n.locale">
-    <head>
-        <meta name="viewport" content="width=device-width">
-        <meta name="format-detection" content="telephone=no">
-        <title>{{ $t('subject') }}</title>
-    </head>
-    <body>
-        <table class="grid">
-            <tbody>
-                <tr>
-                    <td>
-                        <!-- Empty block -->
-                        <div class="grid-row">
-                            <div class="grid-block empty"></div>
-                        </div>
-                        <!-- Header block -->
-                        <div class="grid-row">
-                            <div class="grid-block">
-                                <email-header v-bind="$props"></email-header>
-                            </div>
-                        </div>
-                        <!-- Block -->
     <div class="grid-row">
         <div class="grid-block vn-pa-ml">
             <h1>{{ $t('title') }}</h1>
@@ -31,19 +9,4 @@
             <p v-html="$t('conclusion')"></p>
         </div>
     </div>
-                        <!-- Footer block -->
+</email-body>
-                        <div class="grid-row">
-                            <div class="grid-block">
-                                <email-footer v-bind="$props"></email-footer>
-                            </div>
-                        </div>
-                        <!-- Empty block -->
-                        <div class="grid-row">
-                            <div class="grid-block empty"></div>
-                        </div>
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-    </body>
-</html>

print/templates/email/invoice/invoice.js

@@ -1,7 +1,5 @@
 const Component = require(`vn-print/core/component`);
-const emailHeader = new Component('email-header');
+const emailBody = new Component('email-body');
-const emailFooter = new Component('email-footer');
-
 module.exports = {
     name: 'invoice',
     async serverPrefetch() {
@@ -13,8 +11,7 @@ module.exports = {
         },
     },
     components: {
-        'email-header': emailHeader.build(),
+        'email-body': emailBody.build(),
-        'email-footer': emailFooter.build()
     },
     props: {
         reference: {

print/templates/email/invoiceIn/invoiceIn.html

@@ -1,26 +1,4 @@
-<!DOCTYPE html>
+<email-body v-bind="$props">
-<html v-bind:lang="$i18n.locale">
-    <head>
-        <meta name="viewport" content="width=device-width">
-        <meta name="format-detection" content="telephone=no">
-        <title>{{ $t('subject') }}</title>
-    </head>
-    <body>
-        <table class="grid">
-            <tbody>
-                <tr>
-                    <td>
-                        <!-- Empty block -->
-                        <div class="grid-row">
-                            <div class="grid-block empty"></div>
-                        </div>
-                        <!-- Header block -->
-                        <div class="grid-row">
-                            <div class="grid-block">
-                                <email-header v-bind="$props"></email-header>
-                            </div>
-                        </div>
-                        <!-- Block -->
     <div class="grid-row">
         <div class="grid-block vn-pa-ml">
             <h1>{{ $t('title') }}</h1>
@@ -29,19 +7,4 @@
             <p v-html="$t('conclusion')"></p>
         </div>
     </div>
-                        <!-- Footer block -->
+</email-body>
-                        <div class="grid-row">
-                            <div class="grid-block">
-                                <email-footer v-bind="$props"></email-footer>
-                            </div>
-                        </div>
-                        <!-- Empty block -->
-                        <div class="grid-row">
-                            <div class="grid-block empty"></div>
-                        </div>
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-    </body>
-</html>

print/templates/email/invoiceIn/invoiceIn.js

@@ -1,11 +1,8 @@
 const Component = require(`vn-print/core/component`);
-const emailHeader = new Component('email-header');
+const emailBody = new Component('email-body');
-const emailFooter = new Component('email-footer');
-
 module.exports = {
     name: 'invoiceIn',
     components: {
-        'email-header': emailHeader.build(),
+        'email-body': emailBody.build(),
-        'email-footer': emailFooter.build()
     }
 };

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

@@ -1,26 +1,4 @@
-<!DOCTYPE html>
+<email-body v-bind="$props">
-<html v-bind:lang="$i18n.locale">
-    <head>
-        <meta name="viewport" content="width=device-width">
-        <meta name="format-detection" content="telephone=no">
-        <title>{{ $t('subject') }}</title>
-    </head>
-    <body>
-        <table class="grid">
-            <tbody>
-                <tr>
-                    <td>
-                        <!-- Empty block -->
-                        <div class="grid-row">
-                            <div class="grid-block empty"></div>
-                        </div>
-                        <!-- Header block -->
-                        <div class="grid-row">
-                            <div class="grid-block">
-                                <email-header v-bind="$props"></email-header>
-                            </div>
-                        </div>
-                        <!-- Block -->
     <div class="grid-row">
         <div class="grid-block vn-pa-ml">
             <h1>{{ $t('title') }}</h1>
@@ -60,29 +38,11 @@
             </p>
         </div>
     </div>
-                        <!-- Block -->
     <div class="grid-row" v-if="isPreview">
         <div class="grid-block vn-pa-ml">
-                                <attachment v-for="attachment in attachments" 
+            <attachment v-for="attachment in attachments" v-bind:key="attachment.filename"
-                                    v-bind:key="attachment.filename"
+                v-bind:attachment="attachment" v-bind:args="$props">
-                                    v-bind:attachment="attachment"
-                                    v-bind:args="$props">
             </attachment>
         </div>
     </div>
-                        <!-- Footer block -->
+</email-body>
-                        <div class="grid-row">
-                            <div class="grid-block">
-                                <email-footer v-bind="$props"></email-footer>
-                            </div>
-                        </div>
-                        <!-- Empty block -->
-                        <div class="grid-row">
-                            <div class="grid-block empty"></div>
-                        </div>
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-    </body>
-</html>

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

@@ -1,6 +1,5 @@
 const Component = require(`vn-print/core/component`);
-const emailHeader = new Component('email-header');
+const emailBody = new Component('email-body');
-const emailFooter = new Component('email-footer');
 const attachment = new Component('attachment');
 
 module.exports = {
@@ -28,8 +27,7 @@ module.exports = {
         }
     },
     components: {
-        'email-header': emailHeader.build(),
+        'email-body': emailBody.build(),
-        'email-footer': emailFooter.build(),
         'attachment': attachment.build()
     },
     props: {

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

@@ -1,26 +1,4 @@
-<!DOCTYPE html>
+<email-body v-bind="$props">
-<html v-bind:lang="$i18n.locale">
-    <head>
-        <meta name="viewport" content="width=device-width">
-        <meta name="format-detection" content="telephone=no">
-        <title>{{ $t('subject') }}</title>
-    </head>
-    <body>
-        <table class="grid">
-            <tbody>
-                <tr>
-                    <td>
-                        <!-- Empty block -->
-                        <div class="grid-row">
-                            <div class="grid-block empty"></div>
-                        </div>
-                        <!-- Header block -->
-                        <div class="grid-row">
-                            <div class="grid-block">
-                                <email-header v-bind="$props"></email-header>
-                            </div>
-                        </div>
-                        <!-- Block -->
     <div class="grid-row">
         <div class="grid-block vn-pa-ml">
             <h1>{{ $t('title') }}</h1>
@@ -43,29 +21,11 @@
             </p>
         </div>
     </div>
-                        <!-- Block -->
     <div class="grid-row" v-if="isPreview">
         <div class="grid-block vn-pa-ml">
-                                <attachment v-for="attachment in attachments" 
+            <attachment v-for="attachment in attachments" v-bind:key="attachment.filename"
-                                    v-bind:key="attachment.filename"
+                v-bind:attachment="attachment" v-bind:args="$props">
-                                    v-bind:attachment="attachment"
-                                    v-bind:args="$props">
             </attachment>
         </div>
     </div>
-                        <!-- Footer block -->
+</email-body>
-                        <div class="grid-row">
-                            <div class="grid-block">
-                                <email-footer v-bind="$props"></email-footer>
-                            </div>
-                        </div>
-                        <!-- Empty block -->
-                        <div class="grid-row">
-                            <div class="grid-block empty"></div>
-                        </div>
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-    </body>
-</html>

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

@@ -1,6 +1,5 @@
 const Component = require(`vn-print/core/component`);
-const emailHeader = new Component('email-header');
+const emailBody = new Component('email-body');
-const emailFooter = new Component('email-footer');
 const attachment = new Component('attachment');
 
 module.exports = {
@@ -28,8 +27,7 @@ module.exports = {
         }
     },
     components: {
-        'email-header': emailHeader.build(),
+        'email-body': emailBody.build(),
-        'email-footer': emailFooter.build(),
         'attachment': attachment.build()
     },
     props: {

print/templates/email/osticket-report/osticket-report.html

@@ -1,26 +1,4 @@
-<!DOCTYPE html>
+<email-body v-bind="$props">
-<html v-bind:lang="$i18n.locale">
-    <head>
-        <meta name="viewport" content="width=device-width">
-        <meta name="format-detection" content="telephone=no">
-        <title>{{ $t('subject') }}</title>
-    </head>
-    <body>
-        <table class="grid">
-            <tbody>
-                <tr>
-                    <td>
-                        <!-- Empty block -->
-                        <div class="grid-row">
-                            <div class="grid-block empty"></div>
-                        </div>
-                        <!-- Header block -->
-                        <div class="grid-row">
-                            <div class="grid-block">
-                                <email-header v-bind="$props"></email-header>
-                            </div>
-                        </div>
-                        <!-- Block -->
     <div class="grid-row">
         <div class="grid-block vn-pa-ml">
             <h1>{{ $t('title') }}</h1>
@@ -29,7 +7,10 @@
             <p v-html="$t('totalResolved', [resolvedTickets])"></p>
             <p v-html="$t('grafanaLink')"></p>
             <div class="external-link vn-pa-sm vn-m-md">
-                                    <a v-bind:href="'https://grafana.verdnatura.es/d/2kaHDi9Mk/osticket?orgId=1&from=' + startedTime + '&to=' + endedTime" target="_blank">
+                <a
+                    v-bind:href="'https://grafana.verdnatura.es/d/2kaHDi9Mk/osticket?orgId=1&from=' + startedTime + '&to=' + endedTime"
+                    target="_blank"
+                >
                     https://grafana.verdnatura.es/d/2kaHDi9Mk/osticket?orgId=1&from={{startedTime}}&to={{endedTime}}
                 </a>
             </div>
@@ -41,7 +22,6 @@
             </div>
         </div>
     </div>
-                        <!-- Block -->
     <div class="grid-row">
         <div class="grid-block vn-pa-ml" v-for="technician in technicians">
             <div class="table-title clearfix">
@@ -61,12 +41,8 @@
                     <tr>
                         <td>{{ticket.author}}</td>
                         <td class="font light-gray">
-                                                <div v-bind:title="$t('opened')">
+                            <div v-bind:title="$t('opened')">&#128275; {{ticket.created | date('%d-%m-%Y %H:%M')}}</div>
-                                                    &#128275; {{ticket.created | date('%d-%m-%Y %H:%M')}}
+                            <div v-bind:title="$t('closed')">&#128274; {{ticket.closed | date('%d-%m-%Y %H:%M')}}</div>
-                                                </div>
-                                                <div v-bind:title="$t('closed')">
-                                                    &#128274; {{ticket.closed | date('%d-%m-%Y %H:%M')}}
-                                                </div>
                         </td>
                         <td>
                             <a v-bind:href="'https://cau.verdnatura.es/scp/tickets.php?id=' + ticket.ticket_id">
@@ -80,20 +56,4 @@
             </table>
         </div>
     </div>
-
+</email-body>
-                        <!-- Footer block -->
-                        <div class="grid-row">
-                            <div class="grid-block">
-                                <email-footer v-bind="$props"></email-footer>
-                            </div>
-                        </div>
-                        <!-- Empty block -->
-                        <div class="grid-row">
-                            <div class="grid-block empty"></div>
-                        </div>
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-    </body>
-</html>

print/templates/email/osticket-report/osticket-report.js

@@ -1,6 +1,5 @@
 const Component = require(`vn-print/core/component`);
-const emailHeader = new Component('email-header');
+const emailBody = new Component('email-body');
-const emailFooter = new Component('email-footer');
 
 module.exports = {
     name: 'osticket-report',
@@ -61,8 +60,7 @@ module.exports = {
         }
     },
     components: {
-        'email-header': emailHeader.build(),
+        'email-body': emailBody.build(),
-        'email-footer': emailFooter.build()
     },
     props: {}
 };

print/templates/email/payment-update/payment-update.html

@@ -1,26 +1,4 @@
-<!DOCTYPE html>
+<email-body v-bind="$props">
-<html v-bind:lang="$i18n.locale">
-    <head>
-        <meta name="viewport" content="width=device-width">
-        <meta name="format-detection" content="telephone=no">
-        <title>{{ $t('subject') }}</title>
-    </head>
-    <body>
-        <table class="grid">
-            <tbody>
-                <tr>
-                    <td>
-                        <!-- Empty block -->
-                        <div class="grid-row">
-                            <div class="grid-block empty"></div>
-                        </div>
-                        <!-- Header block -->
-                        <div class="grid-row">
-                            <div class="grid-block">
-                                <email-header v-bind="$props"></email-header>
-                            </div>
-                        </div>
-                        <!-- Block -->
     <div class="grid-row">
         <div class="grid-block vn-pa-ml">
             <h1>{{ $t('title') }}</h1>
@@ -38,8 +16,7 @@
             </section>
             </p>
 
-                                <p v-if="payMethod.code == 'bankDraft'" 
+            <p v-if="payMethod.code == 'bankDraft'" v-html="$t('sections.pay.accountImplicates', [accountAddress])">
-                                    v-html="$t('sections.pay.accountImplicates', [accountAddress])">
             </p>
             <p v-else-if="payMethod.code == 'card'">
                 {{ $t('sections.pay.cardImplicates') }}
@@ -48,19 +25,4 @@
             <p>{{ $t('notifyAnError') }}</p>
         </div>
     </div>
-                        <!-- Footer block -->
+</email-body>
-                        <div class="grid-row">
-                            <div class="grid-block">
-                                <email-footer v-bind="$props"></email-footer>
-                            </div>
-                        </div>
-                        <!-- Empty block -->
-                        <div class="grid-row">
-                            <div class="grid-block empty"></div>
-                        </div>
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-    </body>
-</html>

print/templates/email/payment-update/payment-update.js

@@ -1,6 +1,5 @@
 const Component = require(`vn-print/core/component`);
-const emailHeader = new Component('email-header');
+const emailBody = new Component('email-body');
-const emailFooter = new Component('email-footer');
 
 module.exports = {
     name: 'payment-update',
@@ -21,8 +20,7 @@ module.exports = {
         }
     },
     components: {
-        'email-header': emailHeader.build(),
+        'email-body': emailBody.build(),
-        'email-footer': emailFooter.build()
     },
     props: {
         id: {

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

@@ -1,26 +1,4 @@
-<!DOCTYPE html>
+<email-body v-bind="$props">
-<html v-bind:lang="$i18n.locale">
-    <head>
-        <meta name="viewport" content="width=device-width">
-        <meta name="format-detection" content="telephone=no">
-        <title>{{ $t('subject') }}</title>
-    </head>
-    <body>
-        <table class="grid">
-            <tbody>
-                <tr>
-                    <td>
-                        <!-- Empty block -->
-                        <div class="grid-row">
-                            <div class="grid-block empty"></div>
-                        </div>
-                        <!-- Header block -->
-                        <div class="grid-row">
-                            <div class="grid-block">
-                                <email-header v-bind="$props"></email-header>
-                            </div>
-                        </div>
-                        <!-- Block -->
     <div class="grid-row">
         <div class="grid-block vn-pa-ml">
             <h1>{{ $t('title') }}</h1>
@@ -39,7 +17,6 @@
             </ol>
         </div>
     </div>
-                        <!-- Block -->
     <div class="grid-row">
         <div class="grid-block vn-pa-ml">
             <h1>{{$t('sections.help.title')}}</h1>
@@ -47,7 +24,6 @@
             <p v-html="$t('sections.help.remoteSupport')"></p>
         </div>
     </div>
-                        <!-- Block -->
     <div class="grid-row">
         <div class="grid-block vn-pa-ml">
             <div v-if="client.salesPersonName">
@@ -58,33 +34,16 @@
             </div>
             <div v-if="client.salesPersonEmail">
                 {{$t('salesPersonEmail')}}:
-                                    <strong><a v-bind:href="`mailto:${client.salesPersonEmail}`" target="_blank">{{client.salesPersonEmail}}</strong>
+                <strong><a v-bind:href="`mailto:${client.salesPersonEmail}`"
+                        target="_blank">{{client.salesPersonEmail}}</strong>
             </div>
         </div>
     </div>
-                        <!-- Block -->
     <div class="grid-row" v-if="isPreview">
         <div class="grid-block vn-pa-ml">
-                                <attachment v-for="attachment in attachments" 
+            <attachment v-for="attachment in attachments" v-bind:key="attachment.filename"
-                                    v-bind:key="attachment.filename"
+                v-bind:attachment="attachment" v-bind:args="$props">
-                                    v-bind:attachment="attachment"
-                                    v-bind:args="$props">
             </attachment>
         </div>
     </div>
-                        <!-- Footer block -->
+</email-body>
-                        <div class="grid-row">
-                            <div class="grid-block">
-                                <email-footer v-bind="$props"></email-footer>
-                            </div>
-                        </div>
-                        <!-- Empty block -->
-                        <div class="grid-row">
-                            <div class="grid-block empty"></div>
-                        </div>
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-    </body>
-</html>

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

@@ -1,6 +1,5 @@
 const Component = require(`vn-print/core/component`);
-const emailHeader = new Component('email-header');
+const emailBody = new Component('email-body');
-const emailFooter = new Component('email-footer');
 const attachment = new Component('attachment');
 const attachments = require('./attachments.json');
 
@@ -18,8 +17,7 @@ module.exports = {
         }
     },
     components: {
-        'email-header': emailHeader.build(),
+        'email-body': emailBody.build(),
-        'email-footer': emailFooter.build(),
         'attachment': attachment.build()
     },
     props: {

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

@@ -1,26 +1,4 @@
-<!DOCTYPE html>
+<email-body v-bind="$props">
-<html v-bind:lang="$i18n.locale">
-    <head>
-        <meta name="viewport" content="width=device-width">
-        <meta name="format-detection" content="telephone=no">
-        <title>{{ $t('subject') }}</title>
-    </head>
-    <body>
-        <table class="grid">
-            <tbody>
-                <tr>
-                    <td>
-                        <!-- Empty block -->
-                        <div class="grid-row">
-                            <div class="grid-block empty"></div>
-                        </div>
-                        <!-- Header block -->
-                        <div class="grid-row">
-                            <div class="grid-block">
-                                <email-header v-bind="$props"></email-header>
-                            </div>
-                        </div>
-                        <!-- Block -->
     <div class="grid-row">
         <div class="grid-block vn-pa-ml">
             <h1>{{ $t('title') }}</h1>
@@ -29,29 +7,15 @@
             <p>{{$t('description.conclusion')}}</p>
         </div>
     </div>
-                        <!-- Attachments block -->
     <div class="grid-row" v-if="isPreview">
         <div class="grid-block vn-pa-ml">
-                                <attachment v-for="attachment in attachments" 
+            <attachment
+                v-for="attachment in attachments"
                 v-bind:key="attachment.filename"
                 v-bind:attachment="attachment"
-                                    v-bind:args="$props">
+                v-bind:args="$props"
+            >
             </attachment>
         </div>
     </div>
-                        <!-- Footer block -->
+</email-body>
-                        <div class="grid-row">
-                            <div class="grid-block">
-                                <email-footer v-bind="$props"></email-footer>
-                            </div>
-                        </div>
-                        <!-- Empty block -->
-                        <div class="grid-row">
-                            <div class="grid-block empty"></div>
-                        </div>
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-    </body>
-</html>

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

@@ -1,7 +1,5 @@
 const Component = require(`vn-print/core/component`);
-const emailHeader = new Component('email-header');
+const emailBody = new Component('email-body');
-const emailFooter = new Component('email-footer');
-const attachment = new Component('attachment');
 const attachments = require('./attachments.json');
 
 module.exports = {
@@ -10,9 +8,7 @@ module.exports = {
         return {attachments};
     },
     components: {
-        'email-header': emailHeader.build(),
+        'email-body': emailBody.build()
-        'email-footer': emailFooter.build(),
-        'attachment': attachment.build()
     },
     props: {
         id: {

print/templates/email/supplier-campaign-metrics/supplier-campaign-metrics.html

@@ -1,26 +1,4 @@
-<!DOCTYPE html>
+<email-body v-bind="$props">
-<html v-bind:lang="$i18n.locale">
-    <head>
-        <meta name="viewport" content="width=device-width">
-        <meta name="format-detection" content="telephone=no">
-        <title>{{ $t('subject') }}</title>
-    </head>
-    <body>
-        <table class="grid">
-            <tbody>
-                <tr>
-                    <td>
-                        <!-- Empty block -->
-                        <div class="grid-row">
-                            <div class="grid-block empty"></div>
-                        </div>
-                        <!-- Header block -->
-                        <div class="grid-row">
-                            <div class="grid-block">
-                                <email-header v-bind="$props"></email-header>
-                            </div>
-                        </div>
-                        <!-- Block -->
     <div class="grid-row">
         <div class="grid-block vn-pa-ml">
             <h1>{{ $t('title') }}</h1>
@@ -28,19 +6,4 @@
             <p v-html="$t('description', [minDate, maxDate])"></p>
         </div>
     </div>
-                        <!-- Footer block -->
+</email-body>
-                        <div class="grid-row">
-                            <div class="grid-block">
-                                <email-footer v-bind="$props"></email-footer>
-                            </div>
-                        </div>
-                        <!-- Empty block -->
-                        <div class="grid-row">
-                            <div class="grid-block empty"></div>
-                        </div>
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-    </body>
-</html>

print/templates/email/supplier-campaign-metrics/supplier-campaign-metrics.js

@@ -1,6 +1,5 @@
 const Component = require(`vn-print/core/component`);
-const emailHeader = new Component('email-header');
+const emailBody = new Component('email-body');
-const emailFooter = new Component('email-footer');
 
 module.exports = {
     name: 'supplier-campaign-metrics',
@@ -16,8 +15,7 @@ module.exports = {
         }
     },
     components: {
-        'email-header': emailHeader.build(),
+        'email-body': emailBody.build()
-        'email-footer': emailFooter.build()
     },
     props: {
         id: {

print/templates/reports/balance-compensation/balance-compensation.html

@@ -0,0 +1,31 @@
+<report-body v-bind="$props">
+    <div class="grid-row">
+        <div class="grid-block">
+            <div class="columns">
+                <div class="size50">
+                    <p style="text-align: right">{{$t('Place')}} {{currentDate()}}</p>
+                    <h3 style="text-align: center; margin-top: 8%">{{$t('Compensation') | uppercase}}</h3>
+                    <p style="margin-top: 8%">{{$t('In one hand')}}:</p>
+                    <p style="text-align: justify">
+                        {{company.name}} {{$t('CIF')}} {{company.nif}} {{$t('Home')}} {{company.street}},
+                        {{company.city}}.
+                    </p>
+                    <p style="margin-top: 5%">{{$t('In other hand')}}:</p>
+                    <p style="text-align: justify">
+                        {{$t('Sr')}} {{client.name}} {{$t('NIF')}} {{client.fi}} {{$t('Home')}} {{client.street}},
+                        {{client.city}}.
+                    </p>
+                    <h4 style="text-align: center; margin-top: 10%">{{$t('Agree') | uppercase}}</h4>
+                    <p style="margin-top: 8%; text-align: justify">
+                        {{$t('Date')}} {{client.payed | date('%d-%m-%Y')}} {{$t('Compensate')}} {{client.amountPaid}} €
+                        {{$t('From client')}} {{client.name}} {{$t('Toclient')}} {{company.name}}.
+                    </p>
+                    <p style="margin-top: 8%">
+                        {{$t('Reception')}} <span style="color: blue">administracion@verdnatura.es</span>
+                    </p>
+                    <div style="margin-top: 8%"><small>{{$t('Greetings')}}</small></div>
+                </div>
+            </div>
+        </div>
+    </div>
+</report-body>

print/templates/reports/balance-compensation/balance-compensation.js

@@ -0,0 +1,34 @@
+const Component = require(`vn-print/core/component`);
+const reportBody = new Component('report-body');
+
+module.exports = {
+    name: 'balance-compensation',
+    async serverPrefetch() {
+        this.client = await this.fetchClient(this.id);
+        this.company = await this.fetchCompany(this.id);
+    },
+    methods: {
+        fetchClient(id) {
+            return this.findOneFromDef('client', [id]);
+        },
+        fetchCompany(id) {
+            return this.findOneFromDef('company', [id]);
+        },
+
+        currentDate() {
+            const current = new Date();
+            const date = `${current.getDate()}/${current.getMonth() + 1}/${current.getFullYear()}`;
+            return date;
+        }
+    },
+    components: {
+        'report-body': reportBody.build()
+    },
+    props: {
+        id: {
+            type: Number,
+            required: true,
+            description: 'The receipt id'
+        }
+    }
+};

print/templates/reports/balance-compensation/css/import.js

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

print/templates/reports/balance-compensation/locale/es.yml

@@ -0,0 +1,16 @@
+reportName: compensacion-saldo
+Place: Algemesí, a
+Compensation: Compensación de saldos deudores y acreedores
+In one hand: De una parte
+CIF: con CIF
+NIF: con NIF
+Home: y domicilio sito en 
+In other hand: De la otra
+Sr: Don/Doña
+Agree: Acuerdan
+Date: En fecha de
+Compensate: se ha compensado el saldo de 
+From client: del cliente/proveedor
+To client: con el cliente/proveedor
+Reception: Por favor, rogamos confirmen la recepción de esta compensación al email
+Greetings: Saludos cordiales,

print/templates/reports/balance-compensation/sql/client.sql

@@ -0,0 +1,12 @@
+SELECT
+        c.name,
+        c.socialName,
+        c.street,
+        c.fi,
+        c.city,
+        r.amountPaid,
+        r.payed
+    FROM client c
+        JOIN receipt r ON r.clientFk = c.id
+        JOIN supplier s ON c.fi = s.nif
+    WHERE r.id = ?

print/templates/reports/balance-compensation/sql/company.sql

@@ -0,0 +1,8 @@
+SELECT 
+        s.name,
+        s.nif,
+        s.street,
+        s.city
+    FROM supplier s
+        JOIN receipt r ON r.companyFk = s.id
+    WHERE r.id = ?;

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

@@ -1,13 +1,4 @@
-<!DOCTYPE html>
+<report-body v-bind="$props">
-<html v-bind:lang="$i18n.locale">
-    <body>
-        <table class="grid">
-            <tbody>
-                <tr>
-                    <td>
-                        <!-- Header block -->
-                        <report-header v-bind="$props"></report-header>
-                        <!-- Block -->
     <div class="grid-row">
         <div class="grid-block">
             <div class="columns">
@@ -37,15 +28,9 @@
                         <div class="header">{{$t('clientData')}}</div>
                         <div class="body">
                             <h3 class="uppercase">{{client.socialName}}</h3>
-                                                <div>
+                            <div>{{client.street}}</div>
-                                                    {{client.street}}
+                            <div>{{client.postcode}}, {{client.city}} ({{client.province}})</div>
-                                                </div>
+                            <div>{{client.country}}</div>
-                                                <div>
-                                                    {{client.postcode}}, {{client.city}} ({{client.province}})
-                                                </div>
-                                                <div>
-                                                    {{client.country}}
-                                                </div>
                         </div>
                     </div>
                 </div>
@@ -66,30 +51,22 @@
                     </tr>
                     <tr class="description font light-gray">
                         <td colspan="7">
-                                                <span v-if="sale.value5">
+                            <span v-if="sale.value5"> <strong>{{sale.tag5}}</strong> {{sale.value5}} </span>
-                                                    <strong>{{sale.tag5}}</strong> {{sale.value5}}
+                            <span v-if="sale.value6"> <strong>{{sale.tag6}}</strong> {{sale.value6}} </span>
-                                                </span> 
+                            <span v-if="sale.value7"> <strong>{{sale.tag7}}</strong> {{sale.value7}} </span>
-                                                <span v-if="sale.value6">
-                                                    <strong>{{sale.tag6}}</strong> {{sale.value6}}
-                                                </span> 
-                                                <span v-if="sale.value7">
-                                                    <strong>{{sale.tag7}}</strong> {{sale.value7}}
-                                                </span> 
                         </td>
                     </tr>
                 </tbody>
             </table>
         </div>
     </div>
-                        <!-- Footer block -->
+    <template v-slot:footer>
-                        <report-footer id="pageFooter"
+        <report-footer
+            id="pageFooter"
             v-bind:left-text="$t('client', [client.id])"
             v-bind:center-text="client.socialName"
-                            v-bind="$props">
+            v-bind="$props"
+        >
         </report-footer>
-                    </td>
+    </template>
-                </tr>
+</report-body>
-            </tbody>
-        </table>
-    </body>
-</html>

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

@@ -1,5 +1,5 @@
 const Component = require(`vn-print/core/component`);
-const reportHeader = new Component('report-header');
+const reportBody = new Component('report-body');
 const reportFooter = new Component('report-footer');
 
 module.exports = {
@@ -20,7 +20,7 @@ module.exports = {
         },
     },
     components: {
-        'report-header': reportHeader.build(),
+        'report-body': reportBody.build(),
         'report-footer': reportFooter.build()
     },
     props: {