Merge branch 'dev' into 5284-fueraPlazo

.vscode/settings.json

@@ -4,5 +4,6 @@
     "files.eol": "\n",
     "editor.codeActionsOnSave": {
         "source.fixAll.eslint": true
-    }
+    },
+    "search.useIgnoreFiles": false
 }

Dockerfile

@@ -10,6 +10,7 @@ RUN apt-get update \
         curl \
         ca-certificates \
         gnupg2 \
+        graphicsmagick \
     && curl -fsSL https://deb.nodesource.com/setup_14.x | bash - \
     && apt-get install -y --no-install-recommends nodejs \
     && npm install -g npm@8.19.2

back/methods/collection/previousLabel.js

@@ -1,5 +1,3 @@
-const {Report} = require('vn-print');
-
 module.exports = Self => {
     Self.remoteMethodCtx('previousLabel', {
         description: 'Returns the previa label pdf',
@@ -33,17 +31,5 @@ module.exports = Self => {
         }
     });
 
-    Self.previousLabel = async(ctx, id) => {
-        const args = Object.assign({}, ctx.args);
-        const params = {lang: ctx.req.getLocale()};
-
-        delete args.ctx;
-        for (const param in args)
-            params[param] = args[param];
-
-        const report = new Report('previa-label', params);
-        const stream = await report.toPdfStream();
-
-        return [stream, 'application/pdf', `filename="previa-${id}.pdf"`];
-    };
+    Self.previousLabel = (ctx, id) => Self.printReport(ctx, id, 'previa-label');
 };

back/models/account.js

@@ -131,7 +131,7 @@ module.exports = Self => {
                 WHERE u.id = ?`, [userId], options);
 
         let roles = [];
-        for (role of result)
+        for (const role of result)
             roles.push(role.name);
 
         return roles;

db/changes/231001/00-invoiceOut.sql

@@ -0,0 +1,6 @@
+ALTER TABLE vn.invoiceOutSerial 
+	ADD `type` ENUM('global', 'quick') DEFAULT NULL NULL;
+
+	UPDATE vn.invoiceOutSerial 
+		SET type = 'global'
+		WHERE code IN ('A','V');

db/changes/231001/00-invoiceOut_getWeight.sql

@@ -2,13 +2,15 @@ DROP FUNCTION IF EXISTS `vn`.`invoiceOut_getWeight`;
 
 DELIMITER $$
 $$
-CREATE DEFINER=`root`@`localhost` FUNCTION `vn`.`invoiceOut_getWeight`(vInvoice VARCHAR(15)) RETURNS decimal(10,2)
+CREATE DEFINER=`root`@`localhost` FUNCTION `vn`.`invoiceOut_getWeight`(
+	vInvoiceRef VARCHAR(15)
+)RETURNS decimal(10,2)
     READS SQL DATA
 BEGIN
 /**
  * Calcula el peso de una factura emitida
  *
- * @param vInvoice Id de la factura
+ * @param vInvoiceRef referencia de la factura
  * @return vTotalWeight peso de la factura
  */
 	DECLARE vTotalWeight DECIMAL(10,2);
@@ -22,7 +24,7 @@ BEGIN
 			JOIN item i ON i.id = s.itemFk
 			JOIN itemCost ic ON ic.itemFk = i.id
 				AND ic.warehouseFk = t.warehouseFk
-		WHERE t.refFk = vInvoice
+		WHERE t.refFk = vInvoiceRef
 			AND i.intrastatFk;
 
 	RETURN vTotalWeight;

db/changes/231001/00-report.sql

@@ -0,0 +1,6 @@
+UPDATE `vn`.`report`
+    SET `method`='InvoiceOuts/{refFk}/invoice-out-pdf'
+WHERE name='invoice';
+
+ALTER TABLE `vn`.`printQueue` MODIFY COLUMN printerFk tinyint(3) unsigned DEFAULT 82 NOT NULL;
+

db/changes/231001/01-invoiceOut_getMaxIssued.sql

@@ -0,0 +1,34 @@
+DROP FUNCTION IF EXISTS `vn`.`invoiceOut_getMaxIssued`;
+
+DELIMITER $$
+$$
+CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `vn`.`invoiceOut_getMaxIssued`(
+	vSerial VARCHAR(2),
+	vCompanyFk INT,
+	vYear INT
+) RETURNS DATE
+	READS SQL DATA 
+BEGIN
+/**
+ * Retorna la fecha a partir de la cual es válido emitir una factura 
+ *
+ * @param vSerial Serie de facturación 
+ * @param vCompanyFk Empresa factura emitida
+ * @param vYear Año contable
+ * @return vInvoiceOutIssued fecha factura válida
+ */
+	DECLARE vInvoiceOutIssued DATE;
+	DECLARE vFirstDayOfYear DATE;
+	
+	SET vFirstDayOfYear := MAKEDATE(vYear, 1);
+
+	SELECT IFNULL(MAX(io.issued), vFirstDayOfYear) INTO vInvoiceOutIssued 
+		FROM invoiceOut io
+		WHERE io.serial = vSerial
+			AND io.companyFk = vCompanyFk
+			AND io.issued BETWEEN vFirstDayOfYear 
+				AND util.lastDayOfYear(vFirstDayOfYear);
+
+	RETURN vInvoiceOutIssued;
+END$$
+DELIMITER ;

db/changes/231001/02-invoiceOut_new.sql

@@ -0,0 +1,258 @@
+DROP PROCEDURE IF EXISTS `vn`.`invoiceOut_new`;
+
+DELIMITER $$
+$$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`invoiceOut_new`(
+	vSerial VARCHAR(255),
+	vInvoiceDate DATE,
+	vTaxArea VARCHAR(25),
+	OUT vNewInvoiceId INT)
+BEGIN
+/**
+ * Creación de facturas emitidas.
+ * requiere previamente tabla ticketToInvoice(id).
+ *
+ * @param vSerial serie a la cual se hace la factura
+ * @param vInvoiceDate fecha de la factura
+ * @param vTaxArea tipo de iva en relacion a la empresa y al cliente
+ * @param vNewInvoiceId id de la factura que se acaba de generar
+ * @return vNewInvoiceId
+ */	
+	DECLARE vIsAnySaleToInvoice BOOL;
+	DECLARE vIsAnyServiceToInvoice BOOL;
+	DECLARE vNewRef VARCHAR(255);
+	DECLARE vWorker INT DEFAULT account.myUser_getId();
+	DECLARE vCompanyFk INT;
+	DECLARE vInterCompanyFk INT;
+	DECLARE vClientFk INT;
+	DECLARE vCplusStandardInvoiceTypeFk INT DEFAULT 1;
+	DECLARE vCplusCorrectingInvoiceTypeFk INT DEFAULT 6;
+	DECLARE vCplusSimplifiedInvoiceTypeFk INT DEFAULT 2;
+	DECLARE vCorrectingSerial VARCHAR(1) DEFAULT 'R';
+	DECLARE vSimplifiedSerial VARCHAR(1) DEFAULT 'S';
+	DECLARE vNewInvoiceInFk INT;
+	DECLARE vIsInterCompany BOOL DEFAULT FALSE;
+	DECLARE vIsCEESerial BOOL DEFAULT FALSE;
+	DECLARE vIsCorrectInvoiceDate BOOL;
+	DECLARE vMaxShipped DATE;
+
+	SET vInvoiceDate = IFNULL(vInvoiceDate, util.CURDATE());
+	
+	SELECT t.clientFk, 
+			t.companyFk, 
+			MAX(DATE(t.shipped)),
+			DATE(vInvoiceDate) >= invoiceOut_getMaxIssued(
+				vSerial, 
+				t.companyFk, 
+				YEAR(vInvoiceDate))
+			INTO vClientFk, 
+				vCompanyFk,
+				vMaxShipped,
+				vIsCorrectInvoiceDate
+		FROM ticketToInvoice tt
+			JOIN ticket t ON t.id = tt.id;
+
+	IF(vMaxShipped > vInvoiceDate) THEN 
+		CALL util.throw("Invoice date can't be less than max date");
+	END IF;
+		
+	IF NOT vIsCorrectInvoiceDate THEN
+		CALL util.throw('Exists an invoice with a previous date');
+	END IF;
+		
+	-- Eliminem de ticketToInvoice els tickets que no han de ser facturats
+	DELETE ti.*
+		FROM ticketToInvoice ti
+			JOIN ticket t ON t.id = ti.id
+			JOIN sale s ON s.ticketFk = t.id
+			JOIN item i ON i.id = s.itemFk
+			JOIN supplier su ON su.id = t.companyFk
+			JOIN client c ON c.id = t.clientFk
+			LEFT JOIN itemTaxCountry itc ON itc.itemFk = i.id AND itc.countryFk = su.countryFk
+		WHERE (YEAR(t.shipped) < 2001 AND  t.isDeleted)
+			OR c.isTaxDataChecked = FALSE
+			OR t.isDeleted
+			OR c.hasToInvoice = FALSE
+			OR itc.id IS NULL;
+
+	SELECT SUM(s.quantity * s.price * (100 - s.discount)/100) <> 0
+		INTO vIsAnySaleToInvoice
+		FROM ticketToInvoice t
+			JOIN sale s ON s.ticketFk = t.id;
+
+	SELECT COUNT(*) > 0 INTO vIsAnyServiceToInvoice
+		FROM ticketToInvoice t
+			JOIN ticketService ts ON ts.ticketFk = t.id;
+
+	IF (vIsAnySaleToInvoice OR vIsAnyServiceToInvoice)
+		AND (vCorrectingSerial = vSerial OR NOT hasAnyNegativeBase())
+	THEN
+
+		-- el trigger añade el siguiente Id_Factura correspondiente a la vSerial
+		INSERT INTO invoiceOut(
+			ref,
+			serial,
+			issued,
+			clientFk,
+			dued,
+			companyFk,
+			cplusInvoiceType477Fk
+		)
+			SELECT
+					1,
+					vSerial,
+					vInvoiceDate,
+					vClientFk,
+					getDueDate(vInvoiceDate, dueDay),
+					vCompanyFk,
+					IF(vSerial = vCorrectingSerial,
+						vCplusCorrectingInvoiceTypeFk,
+						IF(vSerial = vSimplifiedSerial,
+							vCplusSimplifiedInvoiceTypeFk,
+							vCplusStandardInvoiceTypeFk))
+				FROM client
+				WHERE id = vClientFk;
+
+		SET vNewInvoiceId = LAST_INSERT_ID();
+
+		SELECT `ref`
+				INTO vNewRef
+			FROM invoiceOut
+			WHERE id = vNewInvoiceId;
+
+		UPDATE ticket t
+				JOIN ticketToInvoice ti ON ti.id = t.id
+			SET t.refFk = vNewRef;
+
+		DROP TEMPORARY TABLE IF EXISTS tmp.updateInter;
+		CREATE TEMPORARY TABLE tmp.updateInter ENGINE = MEMORY
+			SELECT s.id,ti.id ticket_id,vWorker Id_Trabajador
+				FROM ticketToInvoice ti
+					LEFT JOIN ticketState ts ON ti.id = ts.ticket
+					JOIN state s
+				WHERE IFNULL(ts.alertLevel,0) < 3 and s.`code` = getAlert3State(ti.id);
+
+		INSERT INTO ticketTracking(stateFk,ticketFk,workerFk)
+			SELECT * FROM tmp.updateInter;
+
+		INSERT INTO ticketLog (action, userFk, originFk, description)
+			SELECT 'UPDATE', account.myUser_getId(), ti.id, CONCAT('Crea factura ', vNewRef)
+				FROM ticketToInvoice ti;
+
+		CALL invoiceExpenceMake(vNewInvoiceId);
+		CALL invoiceTaxMake(vNewInvoiceId,vTaxArea);
+
+		UPDATE invoiceOut io
+				JOIN (
+					SELECT SUM(amount) total
+						FROM invoiceOutExpence
+						WHERE invoiceOutFk = vNewInvoiceId
+					) base
+				JOIN (
+					SELECT SUM(vat) total
+						FROM invoiceOutTax
+						WHERE invoiceOutFk = vNewInvoiceId
+					) vat
+			SET io.amount = base.total + vat.total
+			WHERE io.id = vNewInvoiceId;
+
+		DROP TEMPORARY TABLE tmp.updateInter;
+	
+		SELECT COUNT(*), id 
+				INTO vIsInterCompany, vInterCompanyFk
+			FROM company 
+			WHERE clientFk = vClientFk;
+		
+		IF (vIsInterCompany) THEN
+
+			INSERT INTO invoiceIn(supplierFk, supplierRef, issued, companyFk)
+				SELECT vCompanyFk, vNewRef, vInvoiceDate, vInterCompanyFk;
+
+			SET vNewInvoiceInFk = LAST_INSERT_ID();
+
+			DROP TEMPORARY TABLE IF EXISTS tmp.ticket;
+			CREATE TEMPORARY TABLE tmp.ticket
+				(KEY (ticketFk))
+				ENGINE = MEMORY
+				SELECT id ticketFk
+					FROM ticketToInvoice;
+
+			CALL `ticket_getTax`('NATIONAL');
+
+			SET @vTaxableBaseServices := 0.00;
+			SET @vTaxCodeGeneral := NULL;
+
+			INSERT INTO invoiceInTax(invoiceInFk, taxableBase, expenceFk, taxTypeSageFk, transactionTypeSageFk)
+				SELECT vNewInvoiceInFk,
+						@vTaxableBaseServices,
+						sub.expenceFk,
+						sub.taxTypeSageFk,
+						sub.transactionTypeSageFk
+					FROM (
+						SELECT @vTaxableBaseServices := SUM(tst.taxableBase) taxableBase,
+								i.expenceFk,
+								i.taxTypeSageFk,
+								i.transactionTypeSageFk,
+								@vTaxCodeGeneral := i.taxClassCodeFk
+							FROM tmp.ticketServiceTax tst
+								JOIN invoiceOutTaxConfig i ON i.taxClassCodeFk = tst.code
+							WHERE i.isService
+							HAVING taxableBase
+						) sub;
+
+			INSERT INTO invoiceInTax(invoiceInFk, taxableBase, expenceFk, taxTypeSageFk, transactionTypeSageFk)
+				SELECT vNewInvoiceInFk, 
+						SUM(tt.taxableBase) - IF(tt.code = @vTaxCodeGeneral,
+						@vTaxableBaseServices, 0) taxableBase,
+						i.expenceFk,
+						i.taxTypeSageFk ,
+						i.transactionTypeSageFk
+					FROM tmp.ticketTax tt
+						JOIN invoiceOutTaxConfig i ON i.taxClassCodeFk = tt.code
+					WHERE !i.isService
+					GROUP BY tt.pgcFk
+					HAVING taxableBase
+					ORDER BY tt.priority;
+
+			CALL invoiceInDueDay_calculate(vNewInvoiceInFk);
+			
+			SELECT COUNT(*) INTO vIsCEESerial 
+				FROM invoiceOutSerial
+				WHERE code = vSerial;
+
+			IF vIsCEESerial THEN
+			
+				INSERT INTO invoiceInIntrastat (
+						invoiceInFk,
+						intrastatFk,
+						amount,
+						stems,
+						countryFk,
+						net)
+					SELECT
+						vNewInvoiceInFk,
+						i.intrastatFk,
+						SUM(CAST((s.quantity * s.price * (100 - s.discount) / 100 ) AS DECIMAL(10, 2))),
+						SUM(CAST(IFNULL(i.stems, 1) * s.quantity AS DECIMAL(10, 2))),
+						su.countryFk,
+						CAST(SUM(IFNULL(i.stems, 1)
+								* s.quantity
+								* IF(ic.grams, ic.grams, IFNULL(i.weightByPiece, 0)) / 1000) AS DECIMAL(10, 2))
+					FROM sale s
+						JOIN ticket t ON s.ticketFk = t.id
+						JOIN supplier su ON su.id = t.companyFk
+						JOIN item i ON i.id = s.itemFk
+						LEFT JOIN itemCost ic ON ic.itemFk = i.id AND ic.warehouseFk = t.warehouseFk
+					WHERE t.refFk = vNewRef
+					GROUP BY i.intrastatFk;
+
+			END IF;
+			DROP TEMPORARY TABLE tmp.ticket;
+			DROP TEMPORARY TABLE tmp.ticketAmount;
+			DROP TEMPORARY TABLE tmp.ticketTax;
+			DROP TEMPORARY TABLE tmp.ticketServiceTax;
+		END IF;
+	END IF;
+	DROP TEMPORARY TABLE `ticketToInvoice`;
+END$$
+DELIMITER ;

db/changes/231001/03-ticketPackaging_add.sql

@@ -0,0 +1,141 @@
+DROP PROCEDURE IF EXISTS `vn`.`ticketPackaging_add`;
+
+DELIMITER $$
+$$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticketPackaging_add`(
+	vClientFk INT,
+	vDated DATE,
+	vCompanyFk INT,
+	vWithoutPeriodGrace BOOLEAN)
+BEGIN
+/**
+ * Genera nuevos tickets de embalajes para los clientes no han los han retornado
+ * y actualiza los valores para la tabla ticketPackaging
+ *
+ * @param vClientFk Cliente en caso de NULL todos los clientes
+ * @param vDated Fecha hasta la cual se revisan los embalajes
+ * @param vCompanyFk Empresa de la cual se comprobaran sus clientes
+ * @param vWithoutPeriodGrace si no se aplica el periodo de gracia de un mes
+ */
+	DECLARE vNewTicket INT;
+	DECLARE vDateStart DATE;
+	DECLARE vDateEnd DATE;
+	DECLARE vGraceDate DATE DEFAULT vDated;
+	DECLARE vWarehouseInventory INT;
+	DECLARE vComponentCost INT;
+	DECLARE vDone INT DEFAULT FALSE;
+	DECLARE vClientId INT;
+	
+	DECLARE vCursor CURSOR FOR
+		SELECT DISTINCT clientFk
+			FROM (
+				SELECT clientFk, SUM(quantity) totalQuantity
+					FROM tmp.packagingToInvoice
+					GROUP BY itemFk, clientFk
+					HAVING totalQuantity > 0)sub;
+
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
+
+	DECLARE EXIT HANDLER FOR SQLEXCEPTION
+	BEGIN
+		ROLLBACK;
+		RESIGNAL;
+	END;
+
+	SELECT id INTO vWarehouseInventory 
+		FROM warehouse 
+		WHERE `code`= 'inv';
+		
+	SELECT id INTO vComponentCost 
+		FROM component 
+		WHERE `code`= 'purchaseValue';
+		
+	SELECT packagingInvoicingDated INTO vDateStart 
+		FROM ticketConfig;	
+	
+	IF vWarehouseInventory IS NULL THEN
+		CALL util.throw('Warehouse inventory not set');
+	END IF;
+
+	IF vComponentCost IS NULL THEN
+		CALL util.throw('Component cost not set');
+	END IF;	
+
+	SET vDateEnd = vDated + INTERVAL 1 DAY;
+	
+	IF NOT vWithoutPeriodGrace THEN
+		SET vGraceDate = vGraceDate -INTERVAL 1 MONTH;
+	END IF;
+	
+	DROP TEMPORARY TABLE IF EXISTS tmp.packagingToInvoice;
+	CREATE TEMPORARY TABLE tmp.packagingToInvoice
+		(INDEX (clientFk))
+		ENGINE = MEMORY
+		SELECT p.itemFk,
+				tp.packagingFk,
+				tp.quantity,
+				tp.ticketFk,
+				p.price,
+				t.clientFk
+			FROM ticketPackaging tp
+				JOIN packaging p ON p.id = tp.packagingFk
+				JOIN ticket t ON t.id = tp.ticketFk 
+				JOIN client c ON c.id = t.clientFk
+			WHERE c.isActive
+				AND (vClientFk IS NULL OR t.clientFk = vClientFk)
+				AND t.shipped BETWEEN vDateStart AND vDateEnd
+				AND (tp.quantity < 0 OR (tp.quantity > 0 AND t.shipped < vGraceDate))
+				AND tp.quantity
+				AND p.itemFk;
+			
+	OPEN vCursor;
+		l: LOOP
+
+			FETCH vCursor INTO vClientId;
+
+			IF vDone THEN
+				LEAVE l;
+			END IF;
+
+			START TRANSACTION;
+
+			CALL ticket_add(
+					vClientId, 
+					vDateEnd,
+					vWarehouseInventory, 
+					vCompanyFk, 
+					NULL, 
+					NULL, 
+					NULL, 
+					vDateEnd, 
+					account.myUser_getId(), 
+					TRUE,
+					vNewTicket);
+				
+				INSERT INTO ticketPackaging(ticketFk, packagingFk, quantity, pvp)
+					SELECT vNewTicket, packagingFk, - SUM(quantity) totalQuantity, price
+						FROM tmp.packagingToInvoice 
+						WHERE clientFk = vClientId
+						GROUP BY packagingFk
+						HAVING IF(vWithoutPeriodGrace, totalQuantity <> 0, totalQuantity < 0);
+	
+				INSERT INTO sale(ticketFk, itemFk, concept, quantity, price)
+					SELECT vNewTicket, pti.itemFk, i.name, SUM(pti.quantity) totalQuantity, pti.price
+						FROM tmp.packagingToInvoice pti
+							JOIN item i ON i.id = pti.itemFk
+						WHERE pti.clientFk = vClientId
+						GROUP BY pti.itemFk
+						HAVING IF(vWithoutPeriodGrace, totalQuantity <> 0, totalQuantity > 0);
+		
+				INSERT INTO saleComponent(saleFk, componentFk, value)
+					SELECT id, vComponentCost, price
+						FROM sale
+						WHERE ticketFk = vNewTicket;
+			
+			COMMIT;
+		END LOOP;
+	CLOSE vCursor;
+
+	DROP TEMPORARY TABLE tmp.packagingToInvoice;
+END$$
+DELIMITER ;

db/dump/fixtures.sql

@@ -164,7 +164,7 @@ INSERT INTO `vn`.`warehouse`(`id`, `name`, `code`, `isComparative`, `isInventory
         (3,  'Warehouse Three', NULL,    1, 1, 1, 1, 0, 0, 2, 1,   1),
         (4,  'Warehouse Four',  NULL,    1, 1, 1, 1, 0, 0, 2, 1,   1),
         (5,  'Warehouse Five',  NULL,    1, 1, 1, 1, 0, 0, 2, 1,   1),
-        (13, 'Inventory',       NULL,    1, 1, 1, 0, 0, 0, 2, 1,   0),
+        (13, 'Inventory',       'inv',   1, 1, 1, 0, 0, 0, 2, 1,   0),
         (60, 'Algemesi',        NULL,    1, 1, 1, 0, 0, 0, 2, 1,   0);
 
 
@@ -173,10 +173,11 @@ INSERT INTO `vn`.`sector`(`id`, `description`, `warehouseFk`, `isPreviousPrepare
         (1, 'First sector',     1, 1, 'FIRST'),
         (2, 'Second sector',    2, 0, 'SECOND');
 
-INSERT INTO `vn`.`printer` (`id`, `name`, `path`, `isLabeler`, `sectorFk`)
+INSERT INTO `vn`.`printer` (`id`, `name`, `path`, `isLabeler`, `sectorFk`, `ipAddress`)
     VALUES
-        (1, 'printer1', 'path1', 0, 1),
-        (2, 'printer2', 'path2', 1, 1);
+        (1, 'printer1', 'path1', 0, 1   , NULL),
+        (2, 'printer2', 'path2', 1, 1   , NULL),
+        (4, 'printer4', 'path4', 0, NULL, '10.1.10.4');
 
 INSERT INTO `vn`.`worker`(`id`, `code`, `firstName`, `lastName`, `userFk`,`bossFk`, `phone`, `sectorFk`, `labelerFk`)
     VALUES
@@ -571,14 +572,13 @@ INSERT INTO `vn`.`taxArea` (`code`, `claveOperacionFactura`, `CodigoTransaccion`
         ('NATIONAL', 0, 1),
         ('WORLD',    2, 15);
 
-INSERT INTO `vn`.`invoiceOutSerial` (`code`, `description`, `isTaxed`, `taxAreaFk`, `isCEE`)
+INSERT INTO `vn`.`invoiceOutSerial` (`code`, `description`, `isTaxed`, `taxAreaFk`, `isCEE`, `type`)
     VALUES
-        ('A', 'Global nacional',         1, 'NATIONAL',  0),
-        ('T', 'Española rapida',         1, 'NATIONAL',  0),
-        ('V', 'Intracomunitaria global', 0, 'CEE',       1),
-        ('M', 'Múltiple nacional',       1, 'NATIONAL',  0),
-        ('E', 'Exportación rápida',      0, 'WORLD',     0);
-;
+        ('A', 'Global nacional',         1, 'NATIONAL',  0, 'global'),
+        ('T', 'Española rapida',         1, 'NATIONAL',  0, 'quick'),
+        ('V', 'Intracomunitaria global', 0, 'CEE',       1, 'global'),
+        ('M', 'Múltiple nacional',       1, 'NATIONAL',  0, 'quick'),
+        ('E', 'Exportación rápida',      0, 'WORLD',     0, 'quick');
 
 INSERT INTO `vn`.`invoiceOut`(`id`, `serial`, `amount`, `issued`,`clientFk`, `created`, `companyFk`, `dued`, `booked`, `bankFk`, `hasPdf`)
     VALUES
@@ -2367,11 +2367,11 @@ INSERT INTO `vn`.`device` (`sn`, `model`, `userFk`)
     VALUES
         ('aaa', 'android', '9');
 
-INSERT INTO `vn`.`queuePriority`(`id`, `priority`)
+INSERT INTO `vn`.`queuePriority`(`id`, `priority`, `code`)
     VALUES
-        (1, 'Alta'),
-        (2, 'Normal'),
-        (3, 'Baja');
+        (1, 'Alta', 'high'),
+        (2, 'Normal', 'normal'),
+        (3, 'Baja', 'low');
 
 INSERT INTO `vn`.`workerTimeControlParams` (`id`, `dayBreak`, `weekBreak`, `weekScope`, `dayWorkMax`, `dayStayMax`, `weekMaxBreak`, `weekMaxScope`, `askInOut`)
     VALUES
@@ -2783,6 +2783,10 @@ INSERT INTO `salix`.`url` (`appName`, `environment`, `url`)
         ('lilium', 'dev', 'http://localhost:8080/#/'),
         ('salix', 'dev', 'http://localhost:5000/#!/');
 
+INSERT INTO `vn`.`report` (`id`, `name`, `paperSizeFk`, `method`)
+    VALUES
+        (3, 'invoice', NULL, 'InvoiceOuts/{refFk}/invoice-out-pdf');
+
 INSERT INTO `vn`.`payDemDetail` (`id`, `detail`)
     VALUES
         (1, 1);

docker-compose.yml

@@ -12,6 +12,9 @@ services:
       placement:
         constraints:
           - node.role == worker
+      resources:
+        limits:
+          memory: 1G
   back:
     image: registry.verdnatura.es/salix-back:${BRANCH_NAME:?}
     build: .
@@ -38,6 +41,9 @@ services:
       placement:
         constraints:
           - node.role == worker
+      resources:
+        limits:
+          memory: 4G
 configs:
   datasources:
     external: true

e2e/helpers/selectors.js

@@ -1052,20 +1052,22 @@ export default {
     invoiceOutIndex: {
         topbarSearch: 'vn-searchbar',
         searchResult: 'vn-invoice-out-index vn-card > vn-table > div > vn-tbody > a.vn-tr',
-        createInvoice: 'vn-invoice-out-index > div > vn-vertical > vn-button > button vn-icon[icon="add"]',
-        createManualInvoice: 'vn-item[name="manualInvoice"]',
-        createGlobalInvoice: 'vn-item[name="globalInvoice"]',
+        createInvoice: 'vn-invoice-out-index > div > vn-button > button vn-icon[icon="add"]',
         manualInvoiceForm: '.vn-invoice-out-manual',
         manualInvoiceTicket: 'vn-autocomplete[ng-model="$ctrl.invoice.ticketFk"]',
         manualInvoiceClient: 'vn-autocomplete[ng-model="$ctrl.invoice.clientFk"]',
         manualInvoiceSerial: 'vn-autocomplete[ng-model="$ctrl.invoice.serial"]',
         manualInvoiceTaxArea: 'vn-autocomplete[ng-model="$ctrl.invoice.taxArea"]',
-        saveInvoice: 'button[response="accept"]',
-        globalInvoiceForm: '.vn-invoice-out-global-invoicing',
-        globalInvoiceClientsRange: 'vn-radio[val="clientsRange"]',
-        globalInvoiceDate: '[ng-model="$ctrl.invoice.invoiceDate"]',
-        globalInvoiceFromClient: '[ng-model="$ctrl.invoice.fromClientId"]',
-        globalInvoiceToClient: '[ng-model="$ctrl.invoice.toClientId"]',
+        saveInvoice: 'button[response="accept"]'
+    },
+    invoiceOutGlobalInvoicing: {
+        oneClient: 'vn-invoice-out-global-invoicing vn-side-menu form > vn-vertical > vn-vertical > vn-radio[val="one"]',
+        allClients: 'vn-invoice-out-global-invoicing vn-side-menu form > vn-vertical > vn-vertical > vn-radio[val="all"]',
+        clientId: 'vn-invoice-out-global-invoicing vn-side-menu form > vn-vertical > vn-autocomplete[ng-model="$ctrl.clientId"]',
+        printer: 'vn-invoice-out-global-invoicing vn-side-menu form > vn-vertical > vn-autocomplete[ng-model="$ctrl.printerFk"]',
+        makeInvoice: 'vn-invoice-out-global-invoicing vn-side-menu form > vn-vertical > vn-submit',
+        invoiceDate: 'vn-invoice-out-global-invoicing vn-side-menu form > vn-vertical > vn-date-picker[ng-model="$ctrl.invoiceDate"]',
+        maxShipped: 'vn-invoice-out-global-invoicing vn-side-menu form > vn-vertical > vn-date-picker[ng-model="$ctrl.maxShipped"]'
     },
     invoiceOutDescriptor: {
         moreMenu: 'vn-invoice-out-descriptor vn-icon-button[icon=more_vert]',

e2e/paths/09-invoice-out/03_manualInvoice.spec.js

@@ -17,7 +17,6 @@ describe('InvoiceOut manual invoice path', () => {
 
     it('should open the manual invoice form', async() => {
         await page.waitToClick(selectors.invoiceOutIndex.createInvoice);
-        await page.waitToClick(selectors.invoiceOutIndex.createManualInvoice);
         await page.waitForSelector(selectors.invoiceOutIndex.manualInvoiceForm);
     });
 
@@ -45,7 +44,6 @@ describe('InvoiceOut manual invoice path', () => {
 
     it('should now open the manual invoice form', async() => {
         await page.waitToClick(selectors.invoiceOutIndex.createInvoice);
-        await page.waitToClick(selectors.invoiceOutIndex.createManualInvoice);
         await page.waitForSelector(selectors.invoiceOutIndex.manualInvoiceForm);
     });
 

e2e/paths/09-invoice-out/04_globalInvoice.spec.js

@@ -17,47 +17,27 @@ describe('InvoiceOut global invoice path', () => {
         await browser.close();
     });
 
-    let invoicesBefore;
+    let invoicesBeforeOneClient;
+    let invoicesBeforeAllClients;
+    let now = Date.vnNew();
 
     it('should count the amount of invoices listed before globla invoces are made', async() => {
-        invoicesBefore = await page.countElement(selectors.invoiceOutIndex.searchResult);
+        invoicesBeforeOneClient = await page.countElement(selectors.invoiceOutIndex.searchResult);
 
-        expect(invoicesBefore).toBeGreaterThanOrEqual(4);
+        expect(invoicesBeforeOneClient).toBeGreaterThanOrEqual(4);
     });
 
     it('should open the global invoice form', async() => {
-        await page.waitToClick(selectors.invoiceOutIndex.createInvoice);
-        await page.waitToClick(selectors.invoiceOutIndex.createGlobalInvoice);
-        await page.waitForSelector(selectors.invoiceOutIndex.globalInvoiceForm);
+        await page.accessToSection('invoiceOut.global-invoicing');
     });
 
     it('should create a global invoice for charles xavier today', async() => {
-        await page.pickDate(selectors.invoiceOutIndex.globalInvoiceDate);
-        await page.waitToClick(selectors.invoiceOutIndex.globalInvoiceClientsRange);
-        await page.autocompleteSearch(selectors.invoiceOutIndex.globalInvoiceFromClient, 'Petter Parker');
-        await page.autocompleteSearch(selectors.invoiceOutIndex.globalInvoiceToClient, 'Petter Parker');
-        await page.waitToClick(selectors.invoiceOutIndex.saveInvoice);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-    });
-
-    it('should count the amount of invoices listed after globla invocing', async() => {
-        await page.waitToClick('[icon="search"]');
-        await page.waitForTimeout(1000); // index search needs time to return results
-        const currentInvoices = await page.countElement(selectors.invoiceOutIndex.searchResult);
-
-        expect(currentInvoices).toBeGreaterThan(invoicesBefore);
-    });
-
-    it('should create a global invoice for all clients today', async() => {
-        await page.waitToClick(selectors.invoiceOutIndex.createInvoice);
-        await page.waitToClick(selectors.invoiceOutIndex.createGlobalInvoice);
-        await page.waitForSelector(selectors.invoiceOutIndex.globalInvoiceForm);
-        await page.pickDate(selectors.invoiceOutIndex.globalInvoiceDate);
-        await page.waitToClick(selectors.invoiceOutIndex.saveInvoice);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
+        await page.waitToClick(selectors.invoiceOutGlobalInvoicing.oneClient);
+        await page.autocompleteSearch(selectors.invoiceOutGlobalInvoicing.clientId, '1108');
+        await page.pickDate(selectors.invoiceOutGlobalInvoicing.invoiceDate, now);
+        await page.pickDate(selectors.invoiceOutGlobalInvoicing.maxShipped, now);
+        await page.autocompleteSearch(selectors.invoiceOutGlobalInvoicing.printer, '1');
+        await page.waitToClick(selectors.invoiceOutGlobalInvoicing.makeInvoice);
+        await page.waitForTimeout(1000);
     });
 });

loopback/common/methods/vn-model/printService.js

@@ -0,0 +1,57 @@
+const {Report, Email} = require('vn-print');
+
+module.exports = Self => {
+    Self.printReport = async function(ctx, id, reportName) {
+        const args = Object.assign({}, ctx.args);
+        const params = {lang: ctx.req.getLocale()};
+
+        delete args.ctx;
+        for (const param in args)
+            params[param] = args[param];
+
+        const report = new Report(reportName, params);
+        const stream = await report.toPdfStream();
+
+        let fileName = `${reportName}`;
+        if (id) fileName += `-${id}`;
+
+        return [stream, 'application/pdf', `filename="${fileName}.pdf"`];
+    };
+
+    Self.printEmail = async function(ctx, id, templateName) {
+        const {accessToken} = ctx.req;
+        const args = Object.assign({}, ctx.args);
+        const params = {lang: ctx.req.getLocale()};
+
+        delete args.ctx;
+        for (const param in args)
+            params[param] = args[param];
+
+        params.isPreview = true;
+        params.access_token = accessToken.id;
+
+        const report = new Email(templateName, params);
+        const html = await report.render();
+
+        let fileName = `${templateName}`;
+        if (id) fileName += `-${id}`;
+
+        return [html, 'text/html', `filename=${fileName}.pdf"`];
+    };
+
+    Self.sendTemplate = async function(ctx, templateName) {
+        const args = Object.assign({}, ctx.args);
+        const params = {
+            recipient: args.recipient,
+            lang: ctx.req.getLocale()
+        };
+
+        delete args.ctx;
+        for (const param in args)
+            params[param] = args[param];
+
+        const email = new Email(templateName, params);
+
+        return email.send();
+    };
+};

loopback/common/models/vn-model.js

@@ -7,6 +7,7 @@ module.exports = function(Self) {
 
     require('../methods/vn-model/getSetValues')(Self);
     require('../methods/vn-model/getEnumValues')(Self);
+    require('../methods/vn-model/printService')(Self);
 
     Object.assign(Self, {
         setup() {

loopback/locale/en.json

@@ -152,5 +152,7 @@
 	"It is not possible to modify sales that their articles are from Floramondo": "It is not possible to modify sales that their articles are from Floramondo",
 	"It is not possible to modify cloned sales": "It is not possible to modify cloned sales",
 	"Valid priorities: 1,2,3": "Valid priorities: 1,2,3",
+	"Warehouse inventory not set": "Almacén inventario no está establecido",
+	"Component cost not set": "Componente coste no está estabecido",
 	"Tickets with associated refunds can't be deleted. This ticket is associated with refund Nº 2": "Tickets with associated refunds can't be deleted. This ticket is associated with refund Nº 2"
-}
+}

loopback/locale/es.json

@@ -251,6 +251,7 @@
 	"Receipt's bank was not found": "No se encontró el banco del recibo",
 	"This receipt was not compensated": "Este recibo no ha sido compensado",
 	"Client's email was not found": "No se encontró el email del cliente",
+	"Negative basis": "Base negativa",
 	"This worker code already exists": "Este codigo de trabajador ya existe",
 	"This personal mail already exists": "Este correo personal ya existe",
 	"This worker already exists": "Este trabajador ya existe",
@@ -264,6 +265,9 @@
 	"It is not possible to modify cloned sales": "No es posible modificar líneas de pedido clonadas",
 	"A supplier with the same name already exists. Change the country.": "Un proveedor con el mismo nombre ya existe. Cambie el país.",
 	"There is no assigned email for this client": "No hay correo asignado para este cliente",
+	"Exists an invoice with a previous date": "Existe una factura con fecha anterior",
+	"Invoice date can't be less than max date": "La fecha de factura no puede ser inferior a la fecha límite",
+	"Warehouse inventory not set": "El almacén inventario no está establecido",
     "This locker has already been assigned": "Esta taquilla ya ha sido asignada",
 	"Tickets with associated refunds": "No se pueden borrar tickets con abonos asociados. Este ticket está asociado al abono Nº {{id}}",
 	"Not exist this branch": "La rama no existe"

modules/claim/back/methods/claim/claimPickupPdf.js

@@ -1,5 +1,3 @@
-const { Report } = require('vn-print');
-
 module.exports = Self => {
     Self.remoteMethodCtx('claimPickupPdf', {
         description: 'Returns the claim pickup order pdf',
@@ -39,17 +37,5 @@ module.exports = Self => {
         }
     });
 
-    Self.claimPickupPdf = async(ctx, id) => { 
-        const args = Object.assign({}, ctx.args);
-        const params = {lang: ctx.req.getLocale()};
-
-        delete args.ctx;
-        for (const param in args)
-            params[param] = args[param];
-
-        const report = new Report('claim-pickup-order', params);
-        const stream = await report.toPdfStream();
-
-        return [stream, 'application/pdf', `filename="doc-${id}.pdf"`];
-    };
+    Self.claimPickupPdf = (ctx, id) => Self.printReport(ctx, id, 'claim-pickup-order');
 };

modules/claim/front/descriptor/index.html

@@ -86,7 +86,20 @@
                     icon="icon-ticket">
                 </vn-quick-link>
             </div>
-            <div ng-transclude="btnThree"></div>
+            <div ng-transclude="btnThree">
+                <vn-quick-link
+                    tooltip="Sale tracking"
+                    state="['ticket.card.saleTracking', {id: $ctrl.claim.ticketFk}]"
+                    icon="assignment">
+                </vn-quick-link>
+            </div>
+            <div ng-transclude="btnFour">
+                <vn-quick-link
+                    tooltip="Ticket tracking"
+                    state="['ticket.card.tracking.index', {id: $ctrl.claim.ticketFk}]"
+                    icon="icon-eye">
+                </vn-quick-link>
+            </div>
         </div>
     </slot-body>
 </vn-descriptor-content>

modules/claim/front/locale/es.yml

@@ -18,3 +18,5 @@ Claim deleted!: Reclamación eliminada!
 claim: reclamación
 Photos: Fotos
 Go to the claim: Ir a la reclamación
+Sale tracking: Líneas preparadas
+Ticket tracking: Estados del ticket

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

@@ -51,19 +51,5 @@ module.exports = Self => {
         }
     });
 
-    Self.campaignMetricsEmail = async ctx => {
-        const args = Object.assign({}, ctx.args);
-        const params = {
-            recipient: args.recipient,
-            lang: ctx.req.getLocale()
-        };
-
-        delete args.ctx;
-        for (const param in args)
-            params[param] = args[param];
-
-        const email = new Email('campaign-metrics', params);
-
-        return email.send();
-    };
+    Self.campaignMetricsEmail = ctx => Self.sendTemplate(ctx, 'campaign-metrics');
 };

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

@@ -1,5 +1,3 @@
-const {Report} = require('vn-print');
-
 module.exports = Self => {
     Self.remoteMethodCtx('campaignMetricsPdf', {
         description: 'Returns the campaign metrics pdf',
@@ -50,17 +48,5 @@ module.exports = Self => {
         }
     });
 
-    Self.campaignMetricsPdf = async(ctx, id) => {
-        const args = Object.assign({}, ctx.args);
-        const params = {lang: ctx.req.getLocale()};
-
-        delete args.ctx;
-        for (const param in args)
-            params[param] = args[param];
-
-        const report = new Report('campaign-metrics', params);
-        const stream = await report.toPdfStream();
-
-        return [stream, 'application/pdf', `filename="doc-${id}.pdf"`];
-    };
+    Self.campaignMetricsPdf = (ctx, id) => Self.printReport(ctx, id, 'campaign-metrics');
 };

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

@@ -46,19 +46,5 @@ module.exports = Self => {
         }
     });
 
-    Self.clientDebtStatementEmail = async ctx => {
-        const args = Object.assign({}, ctx.args);
-        const params = {
-            recipient: args.recipient,
-            lang: ctx.req.getLocale()
-        };
-
-        delete args.ctx;
-        for (const param in args)
-            params[param] = args[param];
-
-        const email = new Email('client-debt-statement', params);
-
-        return email.send();
-    };
+    Self.clientDebtStatementEmail = ctx => Self.sendTemplate(ctx, 'client-debt-statement');
 };

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

@@ -1,5 +1,3 @@
-const {Email} = require('vn-print');
-
 module.exports = Self => {
     Self.remoteMethodCtx('clientDebtStatementHtml', {
         description: 'Returns the client debt statement email preview',
@@ -45,21 +43,5 @@ module.exports = Self => {
         }
     });
 
-    Self.clientDebtStatementHtml = async(ctx, id) => {
-        const {accessToken} = ctx.req;
-        const args = Object.assign({}, ctx.args);
-        const params = {lang: ctx.req.getLocale()};
-
-        delete args.ctx;
-        for (const param in args)
-            params[param] = args[param];
-
-        params.isPreview = true;
-        params.access_token = accessToken.id;
-
-        const report = new Email('client-debt-statement', params);
-        const html = await report.render();
-
-        return [html, 'text/html', `filename="mail-${id}.pdf"`];
-    };
+    Self.clientDebtStatementHtml = (ctx, id) => Self.printEmail(ctx, id, 'client-debt-statement');
 };

modules/client/back/methods/client/clientDebtStatementPdf.js

@@ -1,5 +1,3 @@
-const {Report} = require('vn-print');
-
 module.exports = Self => {
     Self.remoteMethodCtx('clientDebtStatementPdf', {
         description: 'Returns the client debt statement pdf',
@@ -45,17 +43,5 @@ module.exports = Self => {
         }
     });
 
-    Self.clientDebtStatementPdf = async(ctx, id) => {
-        const args = Object.assign({}, ctx.args);
-        const params = {lang: ctx.req.getLocale()};
-
-        delete args.ctx;
-        for (const param in args)
-            params[param] = args[param];
-
-        const report = new Report('client-debt-statement', params);
-        const stream = await report.toPdfStream();
-
-        return [stream, 'application/pdf', `filename="doc-${id}.pdf"`];
-    };
+    Self.clientDebtStatementPdf = (ctx, id) => Self.printReport(ctx, id, 'client-debt-statement');
 };

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

@@ -1,5 +1,3 @@
-const {Email} = require('vn-print');
-
 module.exports = Self => {
     Self.remoteMethodCtx('clientWelcomeEmail', {
         description: 'Sends the client welcome email with an attached PDF',
@@ -41,19 +39,5 @@ module.exports = Self => {
         }
     });
 
-    Self.clientWelcomeEmail = async ctx => {
-        const args = Object.assign({}, ctx.args);
-        const params = {
-            recipient: args.recipient,
-            lang: ctx.req.getLocale()
-        };
-
-        delete args.ctx;
-        for (const param in args)
-            params[param] = args[param];
-
-        const email = new Email('client-welcome', params);
-
-        return email.send();
-    };
+    Self.clientWelcomeEmail = ctx => Self.sendTemplate(ctx, 'client-welcome');
 };

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

@@ -1,5 +1,3 @@
-const {Email} = require('vn-print');
-
 module.exports = Self => {
     Self.remoteMethodCtx('clientWelcomeHtml', {
         description: 'Returns the client welcome email preview',
@@ -40,19 +38,5 @@ module.exports = Self => {
         }
     });
 
-    Self.clientWelcomeHtml = async(ctx, id) => {
-        const args = Object.assign({}, ctx.args);
-        const params = {lang: ctx.req.getLocale()};
-
-        delete args.ctx;
-        for (const param in args)
-            params[param] = args[param];
-
-        params.isPreview = true;
-
-        const report = new Email('client-welcome', params);
-        const html = await report.render();
-
-        return [html, 'text/html', `filename="mail-${id}.pdf"`];
-    };
+    Self.clientWelcomeHtml = (ctx, id) => Self.printEmail(ctx, id, 'client-welcome');
 };

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

@@ -1,5 +1,3 @@
-const {Email} = require('vn-print');
-
 module.exports = Self => {
     Self.remoteMethodCtx('clientCreditEmail', {
         description: 'Sends the credit request email with an attached PDF',
@@ -10,7 +8,7 @@ module.exports = Self => {
                 type: 'number',
                 required: true,
                 description: 'The client id',
-                http: {source: 'path'}
+                http: {source: 'path'},
             },
             {
                 arg: 'recipient',
@@ -22,38 +20,25 @@ module.exports = Self => {
                 arg: 'replyTo',
                 type: 'string',
                 description: 'The sender email to reply to',
-                required: false
+                required: false,
             },
             {
                 arg: 'recipientId',
                 type: 'number',
-                description: 'The recipient id to send to the recipient preferred language',
-                required: false
-            }
+                description:
+                    'The recipient id to send to the recipient preferred language',
+                required: false,
+            },
         ],
         returns: {
             type: ['object'],
-            root: true
+            root: true,
         },
         http: {
             path: '/:id/credit-request-email',
-            verb: 'POST'
-        }
+            verb: 'POST',
+        },
     });
 
-    Self.clientCreditEmail = async ctx => {
-        const args = Object.assign({}, ctx.args);
-        const params = {
-            recipient: args.recipient,
-            lang: ctx.req.getLocale()
-        };
-
-        delete args.ctx;
-        for (const param in args)
-            params[param] = args[param];
-
-        const email = new Email('credit-request', params);
-
-        return email.send();
-    };
+    Self.clientCreditEmail = ctx => Self.sendTemplate(ctx, 'credit-request');
 };

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

@@ -1,5 +1,3 @@
-const {Email} = require('vn-print');
-
 module.exports = Self => {
     Self.remoteMethodCtx('creditRequestHtml', {
         description: 'Returns the credit request email preview',
@@ -40,21 +38,5 @@ module.exports = Self => {
         }
     });
 
-    Self.creditRequestHtml = async(ctx, id) => {
-        const {accessToken} = ctx.req;
-        const args = Object.assign({}, ctx.args);
-        const params = {lang: ctx.req.getLocale()};
-
-        delete args.ctx;
-        for (const param in args)
-            params[param] = args[param];
-
-        params.isPreview = true;
-        params.access_token = accessToken.id;
-
-        const report = new Email('credit-request', params);
-        const html = await report.render();
-
-        return [html, 'text/html', `filename="mail-${id}.pdf"`];
-    };
+    Self.creditRequestHtml = (ctx, id) => Self.printEmail(ctx, id, 'credit-request');
 };

modules/client/back/methods/client/creditRequestPdf.js

@@ -1,5 +1,3 @@
-const {Report} = require('vn-print');
-
 module.exports = Self => {
     Self.remoteMethodCtx('creditRequestPdf', {
         description: 'Returns the credit request pdf',
@@ -40,17 +38,5 @@ module.exports = Self => {
         }
     });
 
-    Self.creditRequestPdf = async(ctx, id) => {
-        const args = Object.assign({}, ctx.args);
-        const params = {lang: ctx.req.getLocale()};
-
-        delete args.ctx;
-        for (const param in args)
-            params[param] = args[param];
-
-        const report = new Report('credit-request', params);
-        const stream = await report.toPdfStream();
-
-        return [stream, 'application/pdf', `filename="doc-${id}.pdf"`];
-    };
+    Self.creditRequestPdf = (ctx, id) => Self.printReport(ctx, id, 'credit-request');
 };

modules/client/back/methods/client/extendedListFilter.js

@@ -97,7 +97,7 @@ module.exports = Self => {
 
         const stmts = [];
         const stmt = new ParameterizedSQL(
-            `SELECT 
+            `SELECT
                     c.id,
                     c.name,
                     c.socialName,

modules/client/back/methods/client/getCard.js

@@ -80,7 +80,7 @@ module.exports = function(Self) {
         const data = await Self.rawSql(query, [id, date], myOptions);
 
         client.debt = data[0].debt;
-        client.unpaid = await Self.app.models.ClientUnpaid.findOne({id}, myOptions);
+        client.unpaid = await Self.app.models.ClientUnpaid.findById(id, null, myOptions);
 
         return client;
     };

modules/client/back/methods/client/incotermsAuthorizationEmail.js

@@ -1,5 +1,3 @@
-const {Email} = require('vn-print');
-
 module.exports = Self => {
     Self.remoteMethodCtx('incotermsAuthorizationEmail', {
         description: 'Sends the incoterms authorization email with an attached PDF',
@@ -47,19 +45,5 @@ module.exports = Self => {
         }
     });
 
-    Self.incotermsAuthorizationEmail = async ctx => {
-        const args = Object.assign({}, ctx.args);
-        const params = {
-            recipient: args.recipient,
-            lang: ctx.req.getLocale()
-        };
-
-        delete args.ctx;
-        for (const param in args)
-            params[param] = args[param];
-
-        const email = new Email('incoterms-authorization', params);
-
-        return email.send();
-    };
+    Self.incotermsAuthorizationEmail = ctx => Self.sendTemplate(ctx, 'incoterms-authorization');
 };

modules/client/back/methods/client/incotermsAuthorizationHtml.js

@@ -1,5 +1,3 @@
-const {Email} = require('vn-print');
-
 module.exports = Self => {
     Self.remoteMethodCtx('incotermsAuthorizationHtml', {
         description: 'Returns the incoterms authorization email preview',
@@ -46,21 +44,5 @@ module.exports = Self => {
         }
     });
 
-    Self.incotermsAuthorizationHtml = async(ctx, id) => {
-        const {accessToken} = ctx.req;
-        const args = Object.assign({}, ctx.args);
-        const params = {lang: ctx.req.getLocale()};
-
-        delete args.ctx;
-        for (const param in args)
-            params[param] = args[param];
-
-        params.isPreview = true;
-        params.access_token = accessToken.id;
-
-        const report = new Email('incoterms-authorization', params);
-        const html = await report.render();
-
-        return [html, 'text/html', `filename="mail-${id}.pdf"`];
-    };
+    Self.incotermsAuthorizationHtml = (ctx, id) => Self.printEmail(ctx, id, 'incoterms-authorization');
 };

modules/client/back/methods/client/incotermsAuthorizationPdf.js

@@ -1,5 +1,3 @@
-const {Report} = require('vn-print');
-
 module.exports = Self => {
     Self.remoteMethodCtx('incotermsAuthorizationPdf', {
         description: 'Returns the incoterms authorization pdf',
@@ -46,17 +44,5 @@ module.exports = Self => {
         }
     });
 
-    Self.incotermsAuthorizationPdf = async(ctx, id) => {
-        const args = Object.assign({}, ctx.args);
-        const params = {lang: ctx.req.getLocale()};
-
-        delete args.ctx;
-        for (const param in args)
-            params[param] = args[param];
-
-        const report = new Report('incoterms-authorization', params);
-        const stream = await report.toPdfStream();
-
-        return [stream, 'application/pdf', `filename="doc-${id}.pdf"`];
-    };
+    Self.incotermsAuthorizationPdf = (ctx, id) => Self.printReport(ctx, id, 'incoterms-authorization');
 };

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

@@ -1,5 +1,3 @@
-const {Email} = require('vn-print');
-
 module.exports = Self => {
     Self.remoteMethodCtx('letterDebtorNdEmail', {
         description: 'Sends the second debtor letter email with an attached PDF',
@@ -47,19 +45,5 @@ module.exports = Self => {
         }
     });
 
-    Self.letterDebtorNdEmail = async ctx => {
-        const args = Object.assign({}, ctx.args);
-        const params = {
-            recipient: args.recipient,
-            lang: ctx.req.getLocale()
-        };
-
-        delete args.ctx;
-        for (const param in args)
-            params[param] = args[param];
-
-        const email = new Email('letter-debtor-nd', params);
-
-        return email.send();
-    };
+    Self.letterDebtorNdEmail = ctx => Self.sendTemplate(ctx, 'letter-debtor-nd');
 };

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

@@ -1,5 +1,3 @@
-const {Email} = require('vn-print');
-
 module.exports = Self => {
     Self.remoteMethodCtx('letterDebtorNdHtml', {
         description: 'Returns the second letter debtor email preview',
@@ -46,21 +44,5 @@ module.exports = Self => {
         }
     });
 
-    Self.letterDebtorNdHtml = async(ctx, id) => {
-        const {accessToken} = ctx.req;
-        const args = Object.assign({}, ctx.args);
-        const params = {lang: ctx.req.getLocale()};
-
-        delete args.ctx;
-        for (const param in args)
-            params[param] = args[param];
-
-        params.isPreview = true;
-        params.access_token = accessToken.id;
-
-        const report = new Email('letter-debtor-nd', params);
-        const html = await report.render();
-
-        return [html, 'text/html', `filename="mail-${id}.pdf"`];
-    };
+    Self.letterDebtorNdHtml = (ctx, id) => Self.printEmail(ctx, id, 'letter-debtor-nd');
 };

modules/client/back/methods/client/letterDebtorPdf.js

@@ -1,5 +1,3 @@
-const {Report} = require('vn-print');
-
 module.exports = Self => {
     Self.remoteMethodCtx('letterDebtorPdf', {
         description: 'Returns the letter debtor pdf',
@@ -46,17 +44,5 @@ module.exports = Self => {
         }
     });
 
-    Self.letterDebtorPdf = async(ctx, id) => {
-        const args = Object.assign({}, ctx.args);
-        const params = {lang: ctx.req.getLocale()};
-
-        delete args.ctx;
-        for (const param in args)
-            params[param] = args[param];
-
-        const report = new Report('letter-debtor', params);
-        const stream = await report.toPdfStream();
-
-        return [stream, 'application/pdf', `filename="doc-${id}.pdf"`];
-    };
+    Self.letterDebtorPdf = (ctx, id) => Self.printReport(ctx, id, 'letter-debtor');
 };

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

@@ -1,5 +1,3 @@
-const {Email} = require('vn-print');
-
 module.exports = Self => {
     Self.remoteMethodCtx('letterDebtorStEmail', {
         description: 'Sends the printer setup email with an attached PDF',
@@ -47,19 +45,5 @@ module.exports = Self => {
         }
     });
 
-    Self.letterDebtorStEmail = async ctx => {
-        const args = Object.assign({}, ctx.args);
-        const params = {
-            recipient: args.recipient,
-            lang: ctx.req.getLocale()
-        };
-
-        delete args.ctx;
-        for (const param in args)
-            params[param] = args[param];
-
-        const email = new Email('letter-debtor-st', params);
-
-        return email.send();
-    };
+    Self.letterDebtorStEmail = ctx => Self.sendTemplate(ctx, 'letter-debtor-st');
 };

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

@@ -1,5 +1,3 @@
-const {Email} = require('vn-print');
-
 module.exports = Self => {
     Self.remoteMethodCtx('letterDebtorStHtml', {
         description: 'Returns the letter debtor email preview',
@@ -46,21 +44,5 @@ module.exports = Self => {
         }
     });
 
-    Self.letterDebtorStHtml = async(ctx, id) => {
-        const {accessToken} = ctx.req;
-        const args = Object.assign({}, ctx.args);
-        const params = {lang: ctx.req.getLocale()};
-
-        delete args.ctx;
-        for (const param in args)
-            params[param] = args[param];
-
-        params.isPreview = true;
-        params.access_token = accessToken.id;
-
-        const report = new Email('letter-debtor-st', params);
-        const html = await report.render();
-
-        return [html, 'text/html', `filename="mail-${id}.pdf"`];
-    };
+    Self.letterDebtorStHtml = (ctx, id) => Self.printEmail(ctx, id, 'letter-debtor-st');
 };

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

@@ -1,5 +1,3 @@
-const {Email} = require('vn-print');
-
 module.exports = Self => {
     Self.remoteMethodCtx('printerSetupEmail', {
         description: 'Sends the printer setup email with an attached PDF',
@@ -41,19 +39,5 @@ module.exports = Self => {
         }
     });
 
-    Self.printerSetupEmail = async ctx => {
-        const args = Object.assign({}, ctx.args);
-        const params = {
-            recipient: args.recipient,
-            lang: ctx.req.getLocale()
-        };
-
-        delete args.ctx;
-        for (const param in args)
-            params[param] = args[param];
-
-        const email = new Email('printer-setup', params);
-
-        return email.send();
-    };
+    Self.printerSetupEmail = ctx => Self.sendTemplate(ctx, 'printer-setup');
 };

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

@@ -1,5 +1,3 @@
-const {Email} = require('vn-print');
-
 module.exports = Self => {
     Self.remoteMethodCtx('printerSetupHtml', {
         description: 'Returns the printer setup email preview',
@@ -40,19 +38,5 @@ module.exports = Self => {
         }
     });
 
-    Self.printerSetupHtml = async(ctx, id) => {
-        const args = Object.assign({}, ctx.args);
-        const params = {lang: ctx.req.getLocale()};
-
-        delete args.ctx;
-        for (const param in args)
-            params[param] = args[param];
-
-        params.isPreview = true;
-
-        const report = new Email('printer-setup', params);
-        const html = await report.render();
-
-        return [html, 'text/html', `filename="mail-${id}.pdf"`];
-    };
+    Self.printerSetupHtml = (ctx, id) => Self.printEmail(ctx, id, 'printer-setup');
 };

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

@@ -1,5 +1,3 @@
-const {Email} = require('vn-print');
-
 module.exports = Self => {
     Self.remoteMethodCtx('sepaCoreEmail', {
         description: 'Sends the campaign metrics email with an attached PDF',
@@ -47,19 +45,5 @@ module.exports = Self => {
         }
     });
 
-    Self.sepaCoreEmail = async ctx => {
-        const args = Object.assign({}, ctx.args);
-        const params = {
-            recipient: args.recipient,
-            lang: ctx.req.getLocale()
-        };
-
-        delete args.ctx;
-        for (const param in args)
-            params[param] = args[param];
-
-        const email = new Email('sepa-core', params);
-
-        return email.send();
-    };
+    Self.sepaCoreEmail = ctx => Self.sendTemplate(ctx, 'sepa-core');
 };

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

@@ -1,5 +1,3 @@
-const { Report } = require('vn-print');
-
 module.exports = Self => {
     Self.remoteMethodCtx('balanceCompensationPdf', {
         description: 'Returns the the debit balances compensation pdf',
@@ -10,7 +8,7 @@ module.exports = Self => {
                 type: 'number',
                 required: true,
                 description: 'The receipt id',
-                http: { source: 'path' }
+                http: {source: 'path'}
             }
         ],
         returns: [
@@ -34,17 +32,5 @@ module.exports = Self => {
         }
     });
 
-    Self.balanceCompensationPdf = async(ctx, id) => {
-        const args = Object.assign({}, ctx.args);
-        const params = {lang: ctx.req.getLocale()};
-
-        delete args.ctx;
-        for (const param in args)
-            params[param] = args[param];
-
-        const report = new Report('balance-compensation', params);
-        const stream = await report.toPdfStream();
-
-        return [stream, 'application/pdf', `filename="doc-${id}.pdf"`];
-    };
+    Self.balanceCompensationPdf = (ctx, id) => Self.printReport(ctx, id, 'balance-compensation');
 };

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

@@ -1,5 +1,3 @@
-const {Report} = require('vn-print');
-
 module.exports = Self => {
     Self.remoteMethodCtx('receiptPdf', {
         description: 'Returns the receipt pdf',
@@ -39,17 +37,5 @@ module.exports = Self => {
         }
     });
 
-    Self.receiptPdf = async(ctx, id) => {
-        const args = Object.assign({}, ctx.args);
-        const params = {lang: ctx.req.getLocale()};
-
-        delete args.ctx;
-        for (const param in args)
-            params[param] = args[param];
-
-        const report = new Report('receipt', params);
-        const stream = await report.toPdfStream();
-
-        return [stream, 'application/pdf', `filename="doc-${id}.pdf"`];
-    };
+    Self.receiptPdf = (ctx, id) => Self.printReport(ctx, id, 'receipt');
 };

modules/client/back/methods/tpv-transaction/confirm.js

@@ -32,45 +32,66 @@ module.exports = Self => {
 
     Self.confirm = async(signatureVersion, merchantParameters, signature) => {
         const $ = Self.app.models;
+        let transaction;
 
-        const decodedParams = JSON.parse(
-            base64url.decode(merchantParameters, 'utf8'));
-        const params = {};
+        try {
+            const decodedParams = JSON.parse(
+                base64url.decode(merchantParameters, 'utf8'));
+            const params = {};
 
-        for (const param in decodedParams)
-            params[param] = decodeURIComponent(decodedParams[param]);
+            for (const param in decodedParams)
+                params[param] = decodeURIComponent(decodedParams[param]);
 
-        const orderId = params['Ds_Order'];
-        const merchantId = parseInt(params['Ds_MerchantCode']);
+            const orderId = params['Ds_Order'];
+            if (!orderId)
+                throw new UserError('Order id not provided');
 
-        if (!orderId)
-            throw new UserError('Order id not found');
-        if (!merchantId)
-            throw new UserError('Mechant id not found');
+            transaction = await Self.findById(orderId, {fields: ['id']});
+            if (!transaction)
+                throw new UserError('Order not found');
 
-        const merchant = await $.TpvMerchant.findById(merchantId, {
-            fields: ['id', 'secretKey']
-        });
+            await transaction.updateAttributes({
+                merchantParameters,
+                signature,
+                signatureVersion,
+            });
 
-        const base64hmac = Self.createSignature(
-            orderId,
-            merchant.secretKey,
-            merchantParameters
-        );
+            const merchantId = parseInt(params['Ds_MerchantCode']);
+            if (!merchantId)
+                throw new UserError('Merchant id not provided');
 
-        if (base64hmac !== base64url.toBase64(signature))
-            throw new UserError('Invalid signature');
+            const merchant = await $.TpvMerchant.findById(merchantId, {
+                fields: ['id', 'secretKey']
+            });
+            if (!merchant)
+                throw new UserError('Merchant not found');
 
-        await Self.rawSql(
-            'CALL hedera.tpvTransaction_confirm(?, ?, ?, ?, ?, ?)', [
-                params['Ds_Amount'],
+            const base64hmac = Self.createSignature(
                 orderId,
-                merchantId,
-                params['Ds_Currency'],
-                params['Ds_Response'],
-                params['Ds_ErrorCode']
-            ]);
+                merchant.secretKey,
+                merchantParameters
+            );
 
-        return true;
+            if (base64hmac !== base64url.toBase64(signature))
+                throw new UserError('Invalid signature');
+
+            await Self.rawSql(
+                'CALL hedera.tpvTransaction_confirm(?, ?, ?, ?, ?, ?)', [
+                    params['Ds_Amount'],
+                    orderId,
+                    merchantId,
+                    params['Ds_Currency'],
+                    params['Ds_Response'],
+                    params['Ds_ErrorCode']
+                ]);
+
+            return true;
+        } catch (err) {
+            if (transaction)
+                await transaction.updateAttribute('responseError', err.message);
+            else
+                console.error(err);
+            throw err;
+        }
     };
 };

modules/client/back/models/client.json

@@ -154,6 +154,11 @@
 			"model": "Account",
 			"foreignKey": "id"
 		},
+		"user": {
+			"type": "belongsTo",
+			"model": "Account",
+			"foreignKey": "id"
+		},
 		"payMethod": {
 			"type": "belongsTo",
 			"model": "PayMethod",

modules/client/back/models/receipt.json

@@ -62,6 +62,11 @@
             "type": "belongsTo",
             "model": "Bank",
             "foreignKey": "bankFk"
+        },
+        "supplier": {
+            "type": "belongsTo",
+            "model": "Supplier",
+            "foreignKey": "companyFk"
         }
     }
-}
+}

modules/client/back/models/tpv-transaction.json

@@ -35,6 +35,18 @@
         },
         "created": {
             "type": "date"
+        },
+        "merchantParameters": {
+            "type": "string"
+        },
+        "signature": {
+            "type": "string"
+        },
+        "signatureVersion": {
+            "type": "string"
+        },
+        "responseError": {
+            "type": "string"
         }
     },
     "relations": {
@@ -45,4 +57,3 @@
         }
     }
 }
-  

modules/client/front/descriptor/index.html

@@ -70,11 +70,12 @@
                 icon="icon-no036"
                 ng-if="$ctrl.client.isTaxDataChecked == false">
             </vn-icon>
-            <vn-icon
+            <vn-icon-button
                 vn-tooltip="{{$ctrl.clientUnpaid()}}"
                 icon="icon-clientUnpaid"
+                ui-sref="client.card.unpaid"
                 ng-if="$ctrl.client.unpaid">
-            </vn-icon>
+            </vn-icon-button>
         </div>
         <div class="quicklinks">
             <div ng-transclude="btnOne">

modules/client/front/descriptor/index.js

@@ -46,8 +46,9 @@ class Controller extends Descriptor {
     }
 
     clientUnpaid() {
-        return this.$t(`Unpaid Dated`, {dated: this.client.unpaid.dated}) +
-            '<br/>' + this.$t(`Unpaid Amount`, {amount: this.client.unpaid.amount});
+        return this.$t(`Unpaid`) + '<br/>'
+             + this.$t(`Unpaid Dated`, {dated: this.client.unpaid.dated}) + '<br/>'
+             + this.$t(`Unpaid Amount`, {amount: this.client.unpaid.amount});
     }
 }
 

modules/client/front/unpaid/index.html

@@ -9,12 +9,12 @@
     </vn-watcher>
     <form
         name="form"
-        ng-submit="watcher.submit()"
+        ng-submit="$ctrl.onSubmit()"
         class="vn-w-md">
         <vn-card class="vn-pa-lg">
             <vn-vertical>
                 <vn-check
-                    label="Unpaid client" 
+                    label="Unpaid client"
                     ng-model="watcher.hasData"
                     on-change="$ctrl.setDefaultDate(watcher.hasData)">
                 </vn-check>
@@ -48,4 +48,4 @@
             </vn-button>
         </vn-button-bar>
     </form>
-</div>
+</div>

modules/client/front/unpaid/index.js

@@ -6,9 +6,17 @@ export default class Controller extends Section {
         if (hasData && !this.clientUnpaid.dated)
             this.clientUnpaid.dated = Date.vnNew();
     }
+
+    onSubmit() {
+        this.$.watcher.submit()
+            .then(() => this.card.reload());
+    }
 }
 
 ngModule.vnComponent('vnClientUnpaid', {
     template: require('./index.html'),
-    controller: Controller
+    controller: Controller,
+    require: {
+        card: '^vnClientCard'
+    }
 });

modules/entry/back/methods/entry/entryOrderPdf.js

@@ -1,5 +1,3 @@
-const {Report} = require('vn-print');
-
 module.exports = Self => {
     Self.remoteMethodCtx('entryOrderPdf', {
         description: 'Returns the entry order pdf',
@@ -38,17 +36,5 @@ module.exports = Self => {
         }
     });
 
-    Self.entryOrderPdf = async(ctx, id) => {
-        const args = Object.assign({}, ctx.args);
-        const params = {lang: ctx.req.getLocale()};
-
-        delete args.ctx;
-        for (const param in args)
-            params[param] = args[param];
-
-        const report = new Report('entry-order', params);
-        const stream = await report.toPdfStream();
-
-        return [stream, 'application/pdf', `filename="doc-${id}.pdf"`];
-    };
+    Self.entryOrderPdf = (ctx, id) => Self.printReport(ctx, id, 'entry-order');
 };

modules/invoiceIn/back/methods/invoice-in/invoiceInEmail.js

@@ -1,5 +1,3 @@
-const {Email} = require('vn-print');
-
 module.exports = Self => {
     Self.remoteMethodCtx('invoiceInEmail', {
         description: 'Sends the invoice in email with an attached PDF',
@@ -35,19 +33,5 @@ module.exports = Self => {
         }
     });
 
-    Self.invoiceInEmail = async ctx => {
-        const args = Object.assign({}, ctx.args);
-        const params = {
-            recipient: args.recipient,
-            lang: ctx.req.getLocale()
-        };
-
-        delete args.ctx;
-        for (const param in args)
-            params[param] = args[param];
-
-        const email = new Email('invoiceIn', params);
-
-        return email.send();
-    };
+    Self.invoiceInEmail = ctx => Self.sendTemplate(ctx, 'invoiceIn');
 };

modules/invoiceIn/back/methods/invoice-in/invoiceInPdf.js

@@ -1,5 +1,3 @@
-const {Report} = require('vn-print');
-
 module.exports = Self => {
     Self.remoteMethodCtx('invoiceInPdf', {
         description: 'Returns the invoiceIn pdf',
@@ -34,17 +32,5 @@ module.exports = Self => {
         }
     });
 
-    Self.invoiceInPdf = async(ctx, id) => {
-        const args = Object.assign({}, ctx.args);
-        const params = {lang: ctx.req.getLocale()};
-        delete args.ctx;
-
-        for (const param in args)
-            params[param] = args[param];
-
-        const report = new Report('invoiceIn', params);
-        const stream = await report.toPdfStream();
-
-        return [stream, 'application/pdf', `filename="doc-${id}.pdf"`];
-    };
+    Self.invoiceInPdf = (ctx, id) => Self.printReport(ctx, id, 'invoiceIn');
 };

modules/invoiceOut/back/methods/invoiceOut/clientsToInvoice.js

@@ -4,47 +4,37 @@ module.exports = Self => {
         accessType: 'WRITE',
         accepts: [
             {
+                arg: 'clientId',
+                type: 'number',
+                description: 'The client id'
+            }, {
                 arg: 'invoiceDate',
                 type: 'date',
-                description: 'The invoice date'
-            },
-            {
+                description: 'The invoice date',
+                required: true
+            }, {
                 arg: 'maxShipped',
                 type: 'date',
-                description: 'The maximum shipped date'
-            },
-            {
-                arg: 'fromClientId',
-                type: 'number',
-                description: 'The minimum client id'
-            },
-            {
-                arg: 'toClientId',
-                type: 'number',
-                description: 'The maximum client id'
-            },
-            {
+                description: 'The maximum shipped date',
+                required: true
+            }, {
                 arg: 'companyFk',
                 type: 'number',
-                description: 'The company id to invoice'
-            }
+                description: 'The company id to invoice',
+                required: true
+            },
         ],
-        returns: [{
-            arg: 'clientsAndAddresses',
-            type: ['object']
+        returns: {
+            type: 'Object',
+            root: true
         },
-        {
-            arg: 'invoice',
-            type: 'object'
-        }],
         http: {
             path: '/clientsToInvoice',
             verb: 'POST'
         }
     });
 
-    Self.clientsToInvoice = async(ctx, options) => {
-        const args = ctx.args;
+    Self.clientsToInvoice = async(ctx, clientId, invoiceDate, maxShipped, companyFk, options) => {
         let tx;
         const myOptions = {};
 
@@ -56,134 +46,52 @@ module.exports = Self => {
             myOptions.transaction = tx;
         }
 
-        let query;
         try {
-            query = `
-                SELECT MAX(issued) issued
-                    FROM vn.invoiceOut io
-                        JOIN vn.time t ON t.dated = io.issued
-                    WHERE io.serial = 'A'
-                        AND t.year = YEAR(?)
-                        AND io.companyFk = ?`;
-            const [maxIssued] = await Self.rawSql(query, [
-                args.invoiceDate,
-                args.companyFk
-            ], myOptions);
-
-            const maxSerialDate = maxIssued.issued || args.invoiceDate;
-            if (args.invoiceDate < maxSerialDate)
-                args.invoiceDate = maxSerialDate;
-
-            if (args.invoiceDate < args.maxShipped)
-                args.maxShipped = args.invoiceDate;
-
-            const minShipped = Date.vnNew();
-            minShipped.setFullYear(minShipped.getFullYear() - 1);
-            minShipped.setMonth(1);
-            minShipped.setDate(1);
-            minShipped.setHours(0, 0, 0, 0);
-
             // Packaging liquidation
             const vIsAllInvoiceable = false;
-            const clientsWithPackaging = await getClientsWithPackaging(ctx, myOptions);
-            for (let client of clientsWithPackaging) {
-                await Self.rawSql('CALL packageInvoicing(?, ?, ?, ?, @newTicket)', [
-                    client.id,
-                    args.invoiceDate,
-                    args.companyFk,
-                    vIsAllInvoiceable
-                ], myOptions);
-            }
+            await Self.rawSql('CALL ticketPackaging_add(?, ?, ?, ?)', [
+                clientId,
+                invoiceDate,
+                companyFk,
+                vIsAllInvoiceable
+            ], myOptions);
 
-            const invoiceableClients = await getInvoiceableClients(ctx, myOptions);
+            const minShipped = Date.vnNew();
+            minShipped.setFullYear(maxShipped.getFullYear() - 1);
 
-            if (!invoiceableClients) return;
+            const query = `
+                SELECT c.id clientId,
+                        c.name clientName,
+                        a.id,
+                        a.nickname
+                    FROM ticket t
+                        JOIN address a ON a.id = t.addressFk
+                        JOIN client c ON c.id = t.clientFk
+                    WHERE t.refFk IS NULL
+                        AND t.shipped BETWEEN ? AND util.dayEnd(?)
+                        AND (t.clientFk = ? OR ? IS NULL )
+                        AND t.companyFk = ?
+                        AND c.hasToInvoice
+                        AND c.isTaxDataChecked
+                        AND c.isActive
+                        AND NOT t.isDeleted
+                    GROUP BY c.id, IF(c.hasToInvoiceByAddress, a.id, TRUE)
+                    HAVING SUM(t.totalWithVat) > 0;`;
 
-            const clientsAndAddresses = invoiceableClients.map(invoiceableClient => {
-                return {
-                    clientId: invoiceableClient.id,
-                    addressId: invoiceableClient.addressFk
-
-                };
-            }
-            );
+            const addresses = await Self.rawSql(query, [
+                minShipped,
+                maxShipped,
+                clientId,
+                clientId,
+                companyFk
+            ], myOptions);
 
             if (tx) await tx.commit();
 
-            return [
-                clientsAndAddresses,
-                {
-                    invoiceDate: args.invoiceDate,
-                    maxShipped: args.maxShipped,
-                    fromClientId: args.fromClientId,
-                    toClientId: args.toClientId,
-                    companyFk: args.companyFk,
-                    minShipped: minShipped
-                }
-            ];
+            return addresses;
         } catch (e) {
             if (tx) await tx.rollback();
             throw e;
         }
     };
-
-    async function getClientsWithPackaging(ctx, options) {
-        const models = Self.app.models;
-        const args = ctx.args;
-        const query = `SELECT DISTINCT clientFk AS id
-                        FROM ticket t
-                            JOIN ticketPackaging tp ON t.id = tp.ticketFk
-                            JOIN client c ON c.id = t.clientFk
-                        WHERE t.shipped BETWEEN  '2017-11-21' AND ?
-                            AND t.clientFk >= ?
-                            AND (t.clientFk <= ? OR ? IS NULL)
-                            AND c.isActive`;
-        return models.InvoiceOut.rawSql(query, [
-            args.maxShipped,
-            args.fromClientId,
-            args.toClientId,
-            args.toClientId
-        ], options);
-    }
-
-    async function getInvoiceableClients(ctx, options) {
-        const models = Self.app.models;
-        const args = ctx.args;
-        const minShipped = Date.vnNew();
-        minShipped.setFullYear(minShipped.getFullYear() - 1);
-
-        const query = `SELECT
-                    c.id,
-                    SUM(IFNULL
-                        (
-                            s.quantity *
-                            s.price * (100-s.discount)/100,
-                        0)
-                            + IFNULL(ts.quantity * ts.price,0)
-                    ) AS sumAmount,
-                    c.hasToInvoiceByAddress,
-                    c.email,
-                    c.isToBeMailed,
-                    a.id addressFk
-            FROM ticket t
-                LEFT JOIN sale s ON s.ticketFk = t.id
-                LEFT JOIN ticketService ts ON ts.ticketFk = t.id
-                JOIN address a ON a.id = t.addressFk
-                JOIN client c ON c.id = t.clientFk
-            WHERE ISNULL(t.refFk) AND c.id >= ?
-                AND (t.clientFk <= ? OR ? IS NULL)
-                AND t.shipped BETWEEN ? AND util.dayEnd(?)
-                AND t.companyFk = ? AND c.hasToInvoice
-                AND c.isTaxDataChecked AND c.isActive
-            GROUP BY c.id, IF(c.hasToInvoiceByAddress,a.id,TRUE) HAVING sumAmount > 0`;
-
-        return models.InvoiceOut.rawSql(query, [
-            args.fromClientId,
-            args.toClientId,
-            args.toClientId,
-            minShipped,
-            args.maxShipped,
-            args.companyFk
-        ], options);
-    }
 };

modules/invoiceOut/back/methods/invoiceOut/createPdf.js

@@ -44,7 +44,7 @@ module.exports = Self => {
         try {
             const invoiceOut = await Self.findById(id, null, myOptions);
             const hasInvoicing = await models.Account.hasRole(userId, 'invoicing', myOptions);
-            console.log(invoiceOut, !hasInvoicing);
+
             if (invoiceOut.hasPdf && !hasInvoicing)
                 throw new UserError(`You don't have enough privileges`);
 

modules/invoiceOut/back/methods/invoiceOut/download.js

@@ -65,7 +65,7 @@ module.exports = Self => {
             try {
                 await fs.access(file.path);
             } catch (error) {
-                await Self.createPdf(ctx, id);
+                await Self.createPdf(ctx, id, myOptions);
             }
 
             const stream = fs.createReadStream(file.path);

modules/invoiceOut/back/methods/invoiceOut/downloadZip.js

@@ -47,7 +47,6 @@ module.exports = Self => {
         ids = ids.split(',');
 
         for (let id of ids) {
-            console.log(zipConfig, totalSize, zipConfig ? zipConfig.maxSize : null);
             if (zipConfig && totalSize > zipConfig.maxSize) throw new UserError('Files are too large');
             const invoiceOutPdf = await models.InvoiceOut.download(ctx, id, myOptions);
             const fileName = extractFileName(invoiceOutPdf[2]);

modules/invoiceOut/back/methods/invoiceOut/exportationPdf.js

@@ -1,5 +1,3 @@
-const {Report} = require('vn-print');
-
 module.exports = Self => {
     Self.remoteMethodCtx('exportationPdf', {
         description: 'Returns the exportation pdf',
@@ -39,17 +37,5 @@ module.exports = Self => {
         }
     });
 
-    Self.exportationPdf = async(ctx, reference) => {
-        const args = Object.assign({}, ctx.args);
-        const params = {lang: ctx.req.getLocale()};
-
-        delete args.ctx;
-        for (const param in args)
-            params[param] = args[param];
-
-        const report = new Report('exportation', params);
-        const stream = await report.toPdfStream();
-
-        return [stream, 'application/pdf', `filename="doc-${reference}.pdf"`];
-    };
+    Self.exportationPdf = (ctx, reference) => Self.printReport(ctx, reference, 'exportation');
 };

modules/invoiceOut/back/methods/invoiceOut/getInvoiceDate.js

@@ -0,0 +1,35 @@
+module.exports = Self => {
+    Self.remoteMethod('getInvoiceDate', {
+        description: 'Returns default Invoice Date',
+        accessType: 'READ',
+        accepts: [
+            {
+                arg: 'companyFk',
+                type: 'number',
+                required: true
+            }
+        ],
+        returns: {
+            type: ['object'],
+            root: true
+        },
+        http: {
+            path: `/getInvoiceDate`,
+            verb: 'GET'
+        }
+    });
+
+    Self.getInvoiceDate = async companyFk => {
+        const models = Self.app.models;
+        const [invoiceDate] = await models.InvoiceOut.rawSql(
+            `SELECT MAX(io.issued) issued
+                FROM invoiceOut io
+                    JOIN invoiceOutSerial ios ON ios.code = io.serial
+                WHERE ios.type = 'global'
+                    AND io.issued 
+                    AND io.companyFk = ?`,
+            [companyFk]
+        );
+        return invoiceDate;
+    };
+};

modules/invoiceOut/back/methods/invoiceOut/invoiceClient.js

@@ -1,43 +1,42 @@
+const UserError = require('vn-loopback/util/user-error');
+
 module.exports = Self => {
     Self.remoteMethodCtx('invoiceClient', {
         description: 'Make a invoice of a client',
         accessType: 'WRITE',
-        accepts: [{
-            arg: 'clientId',
-            type: 'number',
-            description: 'The client id to invoice',
-            required: true
-        },
-        {
-            arg: 'addressId',
-            type: 'number',
-            description: 'The address id to invoice',
-            required: true
-        },
-        {
-            arg: 'invoiceDate',
-            type: 'date',
-            description: 'The invoice date',
-            required: true
-        },
-        {
-            arg: 'maxShipped',
-            type: 'date',
-            description: 'The maximum shipped date',
-            required: true
-        },
-        {
-            arg: 'companyFk',
-            type: 'number',
-            description: 'The company id to invoice',
-            required: true
-        },
-        {
-            arg: 'minShipped',
-            type: 'date',
-            description: 'The minium shupped date',
-            required: true
-        }],
+        accepts: [
+            {
+                arg: 'clientId',
+                type: 'number',
+                description: 'The client id to invoice',
+                required: true
+            }, {
+                arg: 'addressId',
+                type: 'number',
+                description: 'The address id to invoice',
+                required: true
+            }, {
+                arg: 'invoiceDate',
+                type: 'date',
+                description: 'The invoice date',
+                required: true
+            }, {
+                arg: 'maxShipped',
+                type: 'date',
+                description: 'The maximum shipped date',
+                required: true
+            }, {
+                arg: 'companyFk',
+                type: 'number',
+                description: 'The company id to invoice',
+                required: true
+            }, {
+                arg: 'printerFk',
+                type: 'number',
+                description: 'The printer to print',
+                required: true
+            }
+        ],
         returns: {
             type: 'object',
             root: true
@@ -62,69 +61,65 @@ module.exports = Self => {
             myOptions.transaction = tx;
         }
 
+        const minShipped = Date.vnNew();
+        minShipped.setFullYear(args.maxShipped.getFullYear() - 1);
+
         let invoiceId;
         let invoiceOut;
         try {
             const client = await models.Client.findById(args.clientId, {
                 fields: ['id', 'hasToInvoiceByAddress']
             }, myOptions);
-            try {
-                if (client.hasToInvoiceByAddress) {
-                    await Self.rawSql('CALL ticketToInvoiceByAddress(?, ?, ?, ?)', [
-                        args.minShipped,
-                        args.maxShipped,
-                        args.addressId,
-                        args.companyFk
-                    ], myOptions);
-                } else {
-                    await Self.rawSql('CALL invoiceFromClient(?, ?, ?)', [
-                        args.maxShipped,
-                        client.id,
-                        args.companyFk
-                    ], myOptions);
-                }
 
-                // Make invoice
-                const isSpanishCompany = await getIsSpanishCompany(args.companyFk, myOptions);
-
-                // Validates ticket nagative base
-                const hasAnyNegativeBase = await getNegativeBase(myOptions);
-                if (hasAnyNegativeBase && isSpanishCompany)
-                    return tx.rollback();
-
-                query = `SELECT invoiceSerial(?, ?, ?) AS serial`;
-                const [invoiceSerial] = await Self.rawSql(query, [
+            if (client.hasToInvoiceByAddress) {
+                await Self.rawSql('CALL ticketToInvoiceByAddress(?, ?, ?, ?)', [
+                    minShipped,
+                    args.maxShipped,
+                    args.addressId,
+                    args.companyFk
+                ], myOptions);
+            } else {
+                await Self.rawSql('CALL invoiceFromClient(?, ?, ?)', [
+                    args.maxShipped,
                     client.id,
-                    args.companyFk,
-                    'G'
+                    args.companyFk
                 ], myOptions);
-                const serialLetter = invoiceSerial.serial;
-
-                query = `CALL invoiceOut_new(?, ?, NULL, @invoiceId)`;
-                await Self.rawSql(query, [
-                    serialLetter,
-                    args.invoiceDate
-                ], myOptions);
-
-                const [newInvoice] = await Self.rawSql(`SELECT @invoiceId id`, null, myOptions);
-                if (newInvoice.id) {
-                    await Self.rawSql('CALL invoiceOutBooking(?)', [newInvoice.id], myOptions);
-
-                    invoiceId = newInvoice.id;
-                }
-            } catch (e) {
-                const failedClient = {
-                    id: client.id,
-                    stacktrace: e
-                };
-                await notifyFailures(ctx, failedClient, myOptions);
             }
 
-            invoiceOut = await models.InvoiceOut.findById(invoiceId, {
-                include: {
-                    relation: 'client'
-                }
-            }, myOptions);
+            // Make invoice
+            const isSpanishCompany = await getIsSpanishCompany(args.companyFk, myOptions);
+
+            // Validates ticket nagative base
+            const hasAnyNegativeBase = await getNegativeBase(myOptions);
+            if (hasAnyNegativeBase && isSpanishCompany)
+                throw new UserError('Negative basis');
+
+            query = `SELECT invoiceSerial(?, ?, ?) AS serial`;
+            const [invoiceSerial] = await Self.rawSql(query, [
+                client.id,
+                args.companyFk,
+                'G'
+            ], myOptions);
+            const serialLetter = invoiceSerial.serial;
+
+            query = `CALL invoiceOut_new(?, ?, NULL, @invoiceId)`;
+            await Self.rawSql(query, [
+                serialLetter,
+                args.invoiceDate
+            ], myOptions);
+
+            const [newInvoice] = await Self.rawSql(`SELECT @invoiceId id`, null, myOptions);
+            if (newInvoice.id) {
+                await Self.rawSql('CALL invoiceOutBooking(?)', [newInvoice.id], myOptions);
+
+                invoiceOut = await models.InvoiceOut.findById(newInvoice.id, {
+                    include: {
+                        relation: 'client'
+                    }
+                }, myOptions);
+
+                invoiceId = newInvoice.id;
+            }
 
             if (tx) await tx.commit();
         } catch (e) {
@@ -132,15 +127,26 @@ module.exports = Self => {
             throw e;
         }
 
-        ctx.args = {
-            reference: invoiceOut.ref,
-            recipientId: invoiceOut.clientFk,
-            recipient: invoiceOut.client().email
-        };
-        try {
-            await models.InvoiceOut.invoiceEmail(ctx, invoiceOut.ref);
-        } catch (err) {}
-
+        if (invoiceId) {
+            if (!invoiceOut.client().isToBeMailed) {
+                const query = `
+                    CALL vn.report_print(
+                        'invoice',
+                        ?,
+                        account.myUser_getId(),
+                        JSON_OBJECT('refFk', ?),
+                        'normal'
+                    );`;
+                await models.InvoiceOut.rawSql(query, [args.printerFk, invoiceOut.ref]);
+            } else {
+                ctx.args = {
+                    reference: invoiceOut.ref,
+                    recipientId: invoiceOut.clientFk,
+                    recipient: invoiceOut.client().email
+                };
+                await models.InvoiceOut.invoiceEmail(ctx, invoiceOut.ref);
+            }
+        }
         return invoiceId;
     };
 
@@ -148,13 +154,12 @@ module.exports = Self => {
         const models = Self.app.models;
         const query = 'SELECT hasAnyNegativeBase() AS base';
         const [result] = await models.InvoiceOut.rawSql(query, null, options);
-
         return result && result.base;
     }
 
     async function getIsSpanishCompany(companyId, options) {
         const models = Self.app.models;
-        const query = `SELECT COUNT(*) AS total
+        const query = `SELECT COUNT(*) isSpanishCompany
                             FROM supplier s
                                 JOIN country c ON c.id = s.countryFk
                                     AND c.code = 'ES'
@@ -163,28 +168,6 @@ module.exports = Self => {
             companyId
         ], options);
 
-        return supplierCompany && supplierCompany.total;
-    }
-
-    async function notifyFailures(ctx, failedClient, options) {
-        const models = Self.app.models;
-        const userId = ctx.req.accessToken.userId;
-        const $t = ctx.req.__; // $translate
-
-        const worker = await models.EmailUser.findById(userId, null, options);
-        const subject = $t('Global invoicing failed');
-        let body = $t(`Wasn't able to invoice the following clients`) + ':<br/><br/>';
-
-        body += `ID: <strong>${failedClient.id}</strong>
-                <br/> <strong>${failedClient.stacktrace}</strong><br/><br/>`;
-
-        await Self.rawSql(`
-            INSERT INTO vn.mail (sender, replyTo, sent, subject, body)
-                VALUES (?, ?, FALSE, ?, ?)`, [
-            worker.email,
-            worker.email,
-            subject,
-            body
-        ], options);
+        return supplierCompany && supplierCompany.isSpanishCompany;
     }
 };

modules/invoiceOut/back/methods/invoiceOut/invoiceOutPdf.js

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

modules/invoiceOut/back/methods/invoiceOut/specs/downloadZip.spec.js

@@ -1,53 +0,0 @@
-const models = require('vn-loopback/server/server').models;
-const UserError = require('vn-loopback/util/user-error');
-
-describe('InvoiceOut downloadZip()', () => {
-    const userId = 9;
-    const invoiceIds = '1,2';
-    const ctx = {
-        req: {
-
-            accessToken: {userId: userId},
-            headers: {origin: 'http://localhost:5000'},
-        }
-    };
-
-    it('should return part of link to dowloand the zip', async() => {
-        const tx = await models.InvoiceOut.beginTransaction({});
-
-        try {
-            const options = {transaction: tx};
-
-            const result = await models.InvoiceOut.downloadZip(ctx, invoiceIds, options);
-
-            expect(result).toBeDefined();
-
-            await tx.rollback();
-        } catch (e) {
-            await tx.rollback();
-            throw e;
-        }
-    });
-
-    it('should return an error if the size of the files is too large', async() => {
-        const tx = await models.InvoiceOut.beginTransaction({});
-
-        let error;
-        try {
-            const options = {transaction: tx};
-            const zipConfig = {
-                maxSize: 0
-            };
-            await models.ZipConfig.create(zipConfig, options);
-
-            await models.InvoiceOut.downloadZip(ctx, invoiceIds, options);
-
-            await tx.rollback();
-        } catch (e) {
-            await tx.rollback();
-            error = e;
-        }
-
-        expect(error).toEqual(new UserError(`Files are too large`));
-    });
-});

modules/invoiceOut/back/methods/invoiceOut/specs/filter.spec.js

@@ -65,7 +65,6 @@ describe('InvoiceOut filter()', () => {
             await invoiceOut.updateAttribute('hasPdf', true, options);
 
             const result = await models.InvoiceOut.filter(ctx, {id: invoiceOut.id}, options);
-            console.log(result);
 
             expect(result.length).toEqual(1);
 

modules/invoiceOut/back/model-config.json

@@ -8,6 +8,9 @@
     "InvoiceContainer": {
         "dataSource": "invoiceStorage"
     },
+    "Printer": {
+        "dataSource": "vn"
+    },
     "TaxArea": {
         "dataSource": "vn"
     },

modules/invoiceOut/back/models/invoice-out.js

@@ -15,4 +15,6 @@ module.exports = Self => {
     require('../methods/invoiceOut/exportationPdf')(Self);
     require('../methods/invoiceOut/invoiceCsv')(Self);
     require('../methods/invoiceOut/invoiceCsvEmail')(Self);
+    require('../methods/invoiceOut/invoiceOutPdf')(Self);
+    require('../methods/invoiceOut/getInvoiceDate')(Self);
 };

modules/invoiceOut/back/models/printer.json

@@ -0,0 +1,28 @@
+{
+    "name": "Printer",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+          "table": "printer"
+        }
+    },
+    "properties": {
+        "id": {
+            "type": "number",
+            "id": true,
+            "description": "Identifier"
+        },
+        "name": {
+            "type": "string"
+        },
+        "isLabeler": {
+            "type": "boolean"
+        }
+    },
+    "acls": [{
+        "accessType": "READ",
+        "principalType": "ROLE",
+        "principalId": "$everyone",
+        "permission": "ALLOW"
+    }]
+}

modules/invoiceOut/front/descriptor/index.html

@@ -3,7 +3,7 @@
     description="$ctrl.invoiceOut.ref"
     summary="$ctrl.$.summary">
     <slot-dot-menu>
-        <vn-invoice-out-descriptor-menu 
+        <vn-invoice-out-descriptor-menu
             invoice-out="$ctrl.invoiceOut"
             parent-reload="$ctrl.reload()"
         />
@@ -11,23 +11,23 @@
     <slot-body>
         <div class="attributes">
             <vn-label-value
-                label="Date" 
+                label="Date"
                 value="{{$ctrl.invoiceOut.issued | date: 'dd/MM/yyyy'}}">
             </vn-label-value>
             <vn-label-value
-                label="Import" 
+                label="Import"
                 value="{{$ctrl.invoiceOut.amount | currency: 'EUR': 2}}">
             </vn-label-value>
             <vn-label-value
                 label="Client">
-                <span 
+                <span
                     ng-click="clientDescriptor.show($event, $ctrl.invoiceOut.client.id)"
                     class="link">
                     {{$ctrl.invoiceOut.client.name}}
                 </span>
             </vn-label-value>
             <vn-label-value
-                label="Company" 
+                label="Company"
                 value="{{$ctrl.invoiceOut.company.code}}">
             </vn-label-value>
         </div>
@@ -53,4 +53,7 @@
 </vn-descriptor-content>
 <vn-popup vn-id="summary">
     <vn-invoice-out-summary invoice-out="$ctrl.invoiceOut"></vn-invoice-out-summary>
-</vn-popup>
+</vn-popup>
+<vn-client-descriptor-popover
+    vn-id="clientDescriptor">
+</vn-client-descriptor-popover>

modules/invoiceOut/front/global-invoicing/index.html

@@ -0,0 +1,144 @@
+<vn-card
+    ng-if="$ctrl.status"
+    class="vn-w-lg vn-pa-md"
+    style="height: 80px; display: flex; align-items: center; justify-content: center; gap: 20px;">
+    <vn-spinner
+        enable="$ctrl.status != 'done'">
+    </vn-spinner>
+    <div>
+        <div ng-switch="$ctrl.status">
+            <span ng-switch-when="packageInvoicing" translate>
+                Build packaging tickets
+            </span>
+            <span ng-switch-when="invoicing">
+                {{'Invoicing client' | translate}} {{$ctrl.currentAddress.clientId}}
+            </span>
+            <span ng-switch-when="stopping" translate>
+                Stopping process
+            </span>
+            <span ng-switch-when="done" translate>
+                Ended process
+            </span>
+        </div>
+        <div ng-if="$ctrl.nAddresses" class="text-caption text-secondary">
+            {{$ctrl.percentage | percentage: 0}} ({{$ctrl.addressNumber}} {{'of' | translate}} {{$ctrl.nAddresses}})
+        </div>
+    </div>
+</vn-card>
+<vn-card class="vn-w-lg vn-mt-md" ng-if="$ctrl.errors.length">
+    <vn-table>
+        <vn-thead>
+            <vn-tr>
+                <vn-th number>Id</vn-th>
+                <vn-th>Client</vn-th>
+                <vn-th number>Address id</vn-th>
+                <vn-th>Street</vn-th>
+                <vn-th>Error</vn-th>
+            </vn-tr>
+        </vn-thead>
+        <vn-tbody>
+            <vn-tr ng-repeat="error in $ctrl.errors">
+                <vn-td number>
+                    <span
+                        vn-click-stop="clientDescriptor.show($event, error.address.clientId)"
+                        class="link">
+                        {{::error.address.clientId}}
+                    </span>
+                </vn-td>
+                <vn-td expand>
+                    {{::error.address.clientName}}
+                </vn-td>
+                <vn-td number>
+                    {{::error.address.id}}
+                </vn-td>
+                <vn-td expand>
+                    {{::error.address.nickname}}
+                </vn-td>
+                <vn-td expand>
+                    <span class="chip alert">{{::error.message}}</span>
+                </vn-td>
+            </vn-tr>
+        </vn-tbody>
+    </vn-table>
+</vn-card>
+<vn-side-menu side="right">
+    <vn-crud-model
+        auto-load="true"
+        url="InvoiceOutSerials"
+        data="invoiceOutSerials"
+        order="code">
+    </vn-crud-model>
+    <vn-crud-model
+        auto-load="true"
+        url="Companies"
+        data="companies"
+        order="code">
+    </vn-crud-model>
+    <form class="vn-pa-md">
+        <vn-vertical>
+            <vn-vertical class="vn-mb-sm">
+                <vn-radio
+                    label="All clients"
+                    val="all"
+                    ng-model="$ctrl.clientsToInvoice">
+                </vn-radio>
+                <vn-radio
+                    label="One client"
+                    val="one"
+                    ng-model="$ctrl.clientsToInvoice">
+                </vn-radio>
+            </vn-vertical>
+            <vn-autocomplete
+                url="Clients"
+                label="Client"
+                search-function="{or: [{id: $search}, {name: {like: '%'+$search+'%'}}]}"
+                order="id"
+                show-field="name"
+                value-field="id"
+                ng-model="$ctrl.clientId"
+                required="true"
+                ng-if="$ctrl.clientsToInvoice == 'one'">
+                <tpl-item>{{::id}} - {{::name}}</tpl-item>
+            </vn-autocomplete>
+            <vn-date-picker
+                vn-one
+                label="Invoice date"
+                ng-model="$ctrl.invoiceDate">
+            </vn-date-picker>
+            <vn-date-picker
+                vn-one
+                label="Max date"
+                ng-model="$ctrl.maxShipped">
+            </vn-date-picker>
+            <vn-autocomplete
+                url="Companies"
+                label="Company"
+                show-field="code"
+                value-field="id"
+                ng-model="$ctrl.companyFk">
+            </vn-autocomplete>
+            <vn-autocomplete
+                url="Printers"
+                label="Printer"
+                show-field="name"
+                value-field="id"
+                where="{isLabeler: false}"
+                ng-model="$ctrl.printerFk">
+            </vn-autocomplete>
+            <vn-submit
+                ng-if="!$ctrl.invoicing"
+                ng-click="$ctrl.makeInvoice()"
+                label="Invoice out">
+            </vn-submit>
+            <vn-submit
+                ng-if="$ctrl.invoicing"
+                label="Stop"
+                ng-click="$ctrl.stopInvoicing()">
+            </vn-submit>
+        </vn-vertical>
+    </form>
+</vn-side-menu>
+
+<vn-client-descriptor-popover
+    vn-id="clientDescriptor">
+</vn-client-descriptor-popover>

modules/invoiceOut/front/global-invoicing/index.js

@@ -0,0 +1,133 @@
+import ngModule from '../module';
+import Section from 'salix/components/section';
+import UserError from 'core/lib/user-error';
+import './style.scss';
+
+class Controller extends Section {
+    $onInit() {
+        const date = Date.vnNew();
+        Object.assign(this, {
+            maxShipped: new Date(date.getFullYear(), date.getMonth(), 0),
+            clientsToInvoice: 'all',
+        });
+
+        this.$http.get('UserConfigs/getUserConfig')
+            .then(res => {
+                this.companyFk = res.data.companyFk;
+                const params = {
+                    companyFk: this.companyFk
+                };
+                return this.$http.get('InvoiceOuts/getInvoiceDate', {params});
+            })
+            .then(res => {
+                this.minInvoicingDate = res.data.issued ? new Date(res.data.issued) : null;
+                this.invoiceDate = this.minInvoicingDate;
+            });
+    }
+
+    stopInvoicing() {
+        this.status = 'stopping';
+    }
+
+    makeInvoice() {
+        this.invoicing = true;
+        this.status = 'packageInvoicing';
+        this.errors = [];
+        this.addresses = null;
+
+        try {
+            if (this.clientsToInvoice == 'one' && !this.clientId)
+                throw new UserError('Choose a valid client');
+            if (!this.invoiceDate || !this.maxShipped)
+                throw new UserError('Invoice date and the max date should be filled');
+            if (this.invoiceDate < this.maxShipped)
+                throw new UserError('Invoice date can\'t be less than max date');
+            if (this.invoiceDate.getTime() < this.minInvoicingDate.getTime())
+                throw new UserError('Exists an invoice with a previous date');
+            if (!this.companyFk)
+                throw new UserError('Choose a valid company');
+            if (!this.printerFk)
+                throw new UserError('Choose a valid printer');
+
+            if (this.clientsToInvoice == 'all')
+                this.clientId = undefined;
+
+            const params = {
+                invoiceDate: this.invoiceDate,
+                maxShipped: this.maxShipped,
+                clientId: this.clientId,
+                companyFk: this.companyFk
+            };
+            this.$http.post(`InvoiceOuts/clientsToInvoice`, params)
+                .then(res => {
+                    this.addresses = res.data;
+                    if (!this.addresses.length)
+                        throw new UserError(`There aren't tickets to invoice`);
+
+                    this.addressIndex = 0;
+                    return this.invoiceOut();
+                })
+                .catch(err => this.handleError(err));
+        } catch (err) {
+            this.handleError(err);
+        }
+    }
+
+    handleError(err) {
+        this.invoicing = false;
+        this.status = null;
+        throw err;
+    }
+
+    invoiceOut() {
+        if (this.addressIndex == this.addresses.length || this.status == 'stopping') {
+            this.invoicing = false;
+            this.status = 'done';
+            return;
+        }
+
+        this.status = 'invoicing';
+        const address = this.addresses[this.addressIndex];
+        this.currentAddress = address;
+
+        const params = {
+            clientId: address.clientId,
+            addressId: address.id,
+            invoiceDate: this.invoiceDate,
+            maxShipped: this.maxShipped,
+            companyFk: this.companyFk,
+            printerFk: this.printerFk,
+        };
+
+        this.$http.post(`InvoiceOuts/invoiceClient`, params)
+            .catch(res => {
+                this.errors.unshift({
+                    address,
+                    message: res.data.error.message
+                });
+            })
+            .finally(() => {
+                this.addressIndex++;
+                this.invoiceOut();
+            });
+    }
+
+    get nAddresses() {
+        if (!this.addresses) return 0;
+        return this.addresses.length;
+    }
+
+    get addressNumber() {
+        return Math.min(this.addressIndex + 1, this.nAddresses);
+    }
+
+    get percentage() {
+        const len = this.nAddresses;
+        return Math.min(this.addressIndex, len) / len;
+    }
+}
+
+ngModule.vnComponent('vnInvoiceOutGlobalInvoicing', {
+    template: require('./index.html'),
+    controller: Controller
+});

modules/invoiceOut/front/global-invoicing/index.spec.js

@@ -0,0 +1,74 @@
+import './index';
+
+describe('InvoiceOut', () => {
+    describe('Component vnInvoiceOutGlobalInvoicing', () => {
+        let controller;
+        let $httpBackend;
+
+        beforeEach(ngModule('invoiceOut'));
+
+        beforeEach(inject(($componentController, $rootScope, _$httpBackend_) => {
+            $httpBackend = _$httpBackend_;
+            const $scope = $rootScope.$new();
+            const $element = angular.element('<vn-invoice-out-global-invoicing></vn-invoice-out-global-invoicing>');
+
+            controller = $componentController('vnInvoiceOutGlobalInvoicing', {$element, $scope});
+        }));
+
+        describe('makeInvoice()', () => {
+            it('should throw an error when invoiceDate or maxShipped properties are not filled in', () => {
+                jest.spyOn(controller.vnApp, 'showError');
+                controller.clientsToInvoice = 'all';
+
+                let error;
+                try {
+                    controller.makeInvoice();
+                } catch (e) {
+                    error = e.message;
+                }
+
+                const expectedError = 'Invoice date and the max date should be filled';
+
+                expect(error).toBe(expectedError);
+            });
+
+            it('should throw an error when select one client and clientId is not filled in', () => {
+                jest.spyOn(controller.vnApp, 'showError');
+                controller.clientsToInvoice = 'one';
+
+                let error;
+                try {
+                    controller.makeInvoice();
+                } catch (e) {
+                    error = e.message;
+                }
+
+                const expectedError = 'Choose a valid client';
+
+                expect(error).toBe(expectedError);
+            });
+
+            it('should make an http POST query and then call to the showSuccess() method', () => {
+                const date = Date.vnNew();
+                Object.assign(controller, {
+                    invoiceDate: date,
+                    maxShipped: date,
+                    minInvoicingDate: date,
+                    clientsToInvoice: 'one',
+                    clientId: 1101,
+                    companyFk: 442,
+                    printerFk: 1
+                });
+                $httpBackend.expectPOST(`InvoiceOuts/clientsToInvoice`).respond([{
+                    clientId: 1101,
+                    id: 121
+                }]);
+                $httpBackend.expectPOST(`InvoiceOuts/invoiceClient`).respond();
+                controller.makeInvoice();
+                $httpBackend.flush();
+
+                expect(controller.status).toEqual('done');
+            });
+        });
+    });
+});

modules/invoiceOut/front/global-invoicing/locale/es.yml

@@ -0,0 +1,20 @@
+There aren't tickets to invoice: No existen tickets para facturar
+Max date: Fecha límite
+Invoice date: Fecha de factura
+Invoice date can't be less than max date: La fecha de factura no puede ser inferior a la fecha límite
+Invoice date and the max date should be filled: La fecha de factura y la fecha límite deben rellenarse
+Choose a valid company: Selecciona un empresa válida
+Choose a valid printer: Selecciona una impresora válida
+All clients: Todos los clientes
+Build packaging tickets: Generando tickets de embalajes
+Address id: Id dirección
+Printer: Impresora
+of: de
+Client: Cliente
+Current client id: Id cliente actual
+Invoicing client: Facturando cliente
+Ended process: Proceso finalizado
+Invoice out: Facturar
+One client: Un solo cliente
+Choose a valid client: Selecciona un cliente válido
+Stop: Parar

modules/invoiceOut/front/global-invoicing/style.scss

@@ -0,0 +1,17 @@
+@import "variables";
+
+vn-invoice-out-global-invoicing{
+
+    h5{
+        color: $color-primary;
+    }
+
+    #error {
+        line-break: normal;
+        overflow-wrap: break-word;
+        white-space: normal;
+    }
+
+}
+
+

modules/invoiceOut/front/index.js

@@ -9,4 +9,4 @@ import './descriptor';
 import './descriptor-popover';
 import './descriptor-menu';
 import './index/manual';
-import './index/global-invoicing';
+import './global-invoicing';

modules/invoiceOut/front/index/global-invoicing/index.html

@@ -1,96 +0,0 @@
-<tpl-title translate>
-    Create global invoice
-</tpl-title>
-<tpl-body id="manifold-form">
-    <vn-crud-model
-        auto-load="true"
-        url="InvoiceOutSerials"
-        data="invoiceOutSerials"
-        order="code">
-    </vn-crud-model>
-    <vn-crud-model
-        auto-load="true"
-        url="Companies"
-        data="companies"
-        order="code">
-    </vn-crud-model> 
-    <div 
-        class="progress vn-my-md" 
-        ng-if="$ctrl.packageInvoicing">
-        <vn-horizontal>
-            <div>
-                {{'Calculating packages to invoice...' | translate}}
-            </div>
-        </vn-horizontal>
-    </div>
-    <div 
-        class="progress vn-my-md" 
-        ng-if="$ctrl.lastClientId">
-        <vn-horizontal>
-            <div>
-                {{'Id Client' | translate}}: {{$ctrl.currentClientId}} 
-                {{'of' | translate}} {{::$ctrl.lastClientId}}
-            </div>
-        </vn-horizontal>
-    </div>
-    <vn-horizontal>
-        <vn-date-picker
-            vn-one
-            label="Invoice date"
-            ng-model="$ctrl.invoice.invoiceDate">
-        </vn-date-picker>
-        <vn-date-picker
-            vn-one
-            label="Max date"
-            ng-model="$ctrl.invoice.maxShipped">
-        </vn-date-picker>
-    </vn-horizontal>
-    <vn-horizontal>
-        <vn-radio
-            label="All clients"
-            val="allClients"
-            ng-model="$ctrl.clientsNumber"
-            ng-click="$ctrl.$onInit()">
-        </vn-radio>
-        <vn-radio
-            label="Clients range"
-            val="clientsRange"
-            ng-model="$ctrl.clientsNumber">
-        </vn-radio>
-    </vn-horizontal>
-    <vn-horizontal ng-show="$ctrl.clientsNumber == 'clientsRange'">
-        <vn-autocomplete
-            url="Clients"
-            label="From client"
-            search-function="{or: [{id: $search}, {name: {like: '%'+$search+'%'}}]}"
-            order="id"
-            show-field="name"
-            value-field="id"
-            ng-model="$ctrl.invoice.fromClientId">
-            <tpl-item>{{::id}} - {{::name}}</tpl-item>
-        </vn-autocomplete>
-        <vn-autocomplete
-            url="Clients"
-            label="To client"
-            search-function="{or: [{id: $search}, {name: {like: '%'+$search+'%'}}]}"
-            order="id"
-            show-field="name"
-            value-field="id"
-            ng-model="$ctrl.invoice.toClientId">
-            <tpl-item>{{::id}} - {{::name}}</tpl-item>
-        </vn-autocomplete>
-    </vn-horizontal>
-    <vn-horizontal>
-        <vn-autocomplete
-            url="Companies"
-            label="Company"
-            show-field="code"
-            value-field="id"
-            ng-model="$ctrl.invoice.companyFk">
-        </vn-autocomplete>
-    </vn-horizontal>
-</tpl-body>
-<tpl-buttons>
-    <input type="button" response="cancel" translate-attr="{value: 'Cancel'}"/>
-    <button vn-id="invoiceButton" response="accept" translate>Invoice</button>{{$ctrl.isInvoicing}}
-</tpl-buttons>

modules/invoiceOut/front/index/global-invoicing/index.js

@@ -1,129 +0,0 @@
-import ngModule from '../../module';
-import Dialog from 'core/components/dialog';
-import './style.scss';
-
-class Controller extends Dialog {
-    constructor($element, $, $transclude) {
-        super($element, $, $transclude);
-        this.invoice = {
-            maxShipped: Date.vnNew()
-        };
-        this.clientsNumber = 'allClients';
-    }
-
-    $onInit() {
-        this.getMinClientId();
-        this.getMaxClientId();
-    }
-
-    getMinClientId() {
-        this.getClientId('min')
-            .then(res => this.invoice.fromClientId = res.data.id);
-    }
-
-    getMaxClientId() {
-        this.getClientId('max')
-            .then(res => this.invoice.toClientId = res.data.id);
-    }
-
-    getClientId(func) {
-        const order = func == 'min' ? 'ASC' : 'DESC';
-        const params = {
-            filter: {
-                order: 'id ' + order,
-                limit: 1
-            }
-        };
-        return this.$http.get('Clients/findOne', {params});
-    }
-
-    get companyFk() {
-        return this.invoice.companyFk;
-    }
-
-    set companyFk(value) {
-        this.invoice.companyFk = value;
-    }
-
-    restartValues() {
-        this.lastClientId = null;
-        this.$.invoiceButton.disabled = false;
-    }
-
-    cancelRequest() {
-        this.canceler = this.$q.defer();
-        return {timeout: this.canceler.promise};
-    }
-
-    invoiceOut(invoice, clientsAndAddresses) {
-        const [clientAndAddress] = clientsAndAddresses;
-        if (!clientAndAddress) return;
-        this.currentClientId = clientAndAddress.clientId;
-        const params = {
-            clientId: clientAndAddress.clientId,
-            addressId: clientAndAddress.addressId,
-            invoiceDate: invoice.invoiceDate,
-            maxShipped: invoice.maxShipped,
-            companyFk: invoice.companyFk,
-            minShipped: invoice.minShipped,
-
-        };
-
-        const options = this.cancelRequest();
-
-        return this.$http.post(`InvoiceOuts/invoiceClient`, params, options)
-            .then(() => {
-                clientsAndAddresses.shift();
-                return this.invoiceOut(invoice, clientsAndAddresses);
-            });
-    }
-
-    responseHandler(response) {
-        try {
-            if (response !== 'accept')
-                return super.responseHandler(response);
-
-            if (!this.invoice.invoiceDate || !this.invoice.maxShipped)
-                throw new Error('Invoice date and the max date should be filled');
-
-            if (!this.invoice.fromClientId || !this.invoice.toClientId)
-                throw new Error('Choose a valid clients range');
-
-            this.on('close', () => {
-                if (this.canceler) this.canceler.resolve();
-                this.vnApp.showSuccess(this.$t('Data saved!'));
-            });
-
-            this.$.invoiceButton.disabled = true;
-            this.packageInvoicing = true;
-            const options = this.cancelRequest();
-
-            this.$http.post(`InvoiceOuts/clientsToInvoice`, this.invoice, options)
-                .then(res => {
-                    this.packageInvoicing = false;
-                    const invoice = res.data.invoice;
-                    const clientsAndAddresses = res.data.clientsAndAddresses;
-                    if (!clientsAndAddresses.length) return super.responseHandler(response);
-                    this.lastClientId = clientsAndAddresses[clientsAndAddresses.length - 1].clientId;
-                    return this.invoiceOut(invoice, clientsAndAddresses);
-                })
-                .then(() => super.responseHandler(response))
-                .then(() => this.vnApp.showSuccess(this.$t('Data saved!')))
-                .finally(() => this.restartValues());
-        } catch (e) {
-            this.vnApp.showError(this.$t(e.message));
-            this.restartValues();
-            return false;
-        }
-    }
-}
-
-Controller.$inject = ['$element', '$scope', '$transclude'];
-
-ngModule.vnComponent('vnInvoiceOutGlobalInvoicing', {
-    slotTemplate: require('./index.html'),
-    controller: Controller,
-    bindings: {
-        companyFk: '<?'
-    }
-});

modules/invoiceOut/front/index/global-invoicing/index.spec.js

@@ -1,118 +0,0 @@
-import './index';
-
-describe('InvoiceOut', () => {
-    describe('Component vnInvoiceOutGlobalInvoicing', () => {
-        let controller;
-        let $httpBackend;
-        let $httpParamSerializer;
-
-        beforeEach(ngModule('invoiceOut'));
-
-        beforeEach(inject(($componentController, $rootScope, _$httpBackend_, _$httpParamSerializer_) => {
-            $httpBackend = _$httpBackend_;
-            $httpParamSerializer = _$httpParamSerializer_;
-            let $scope = $rootScope.$new();
-            const $element = angular.element('<vn-invoice-out-global-invoicing></vn-invoice-out-global-invoicing>');
-            const $transclude = {
-                $$boundTransclude: {
-                    $$slots: []
-                }
-            };
-            controller = $componentController('vnInvoiceOutGlobalInvoicing', {$element, $scope, $transclude});
-            controller.$.invoiceButton = {disabled: false};
-        }));
-
-        describe('getMinClientId()', () => {
-            it('should set the invoice fromClientId property', () => {
-                const filter = {
-                    order: 'id ASC',
-                    limit: 1
-                };
-
-                const serializedParams = $httpParamSerializer({filter});
-                $httpBackend.expectGET(`Clients/findOne?${serializedParams}`).respond(200, {id: 1101});
-
-                controller.getMinClientId();
-                $httpBackend.flush();
-
-                expect(controller.invoice.fromClientId).toEqual(1101);
-            });
-        });
-
-        describe('getMaxClientId()', () => {
-            it('should set the invoice toClientId property', () => {
-                const filter = {
-                    order: 'id DESC',
-                    limit: 1
-                };
-
-                const serializedParams = $httpParamSerializer({filter});
-                $httpBackend.expectGET(`Clients/findOne?${serializedParams}`).respond(200, {id: 1112});
-
-                controller.getMaxClientId();
-                $httpBackend.flush();
-
-                expect(controller.invoice.toClientId).toEqual(1112);
-            });
-        });
-
-        describe('responseHandler()', () => {
-            it('should throw an error when invoiceDate or maxShipped properties are not filled in', () => {
-                jest.spyOn(controller.vnApp, 'showError');
-
-                controller.invoice = {
-                    fromClientId: 1101,
-                    toClientId: 1101
-                };
-
-                controller.responseHandler('accept');
-
-                const expectedError = 'Invoice date and the max date should be filled';
-
-                expect(controller.vnApp.showError).toHaveBeenCalledWith(expectedError);
-            });
-
-            it('should throw an error when fromClientId or toClientId properties are not filled in', () => {
-                jest.spyOn(controller.vnApp, 'showError');
-
-                controller.invoice = {
-                    invoiceDate: Date.vnNew(),
-                    maxShipped: Date.vnNew()
-                };
-
-                controller.responseHandler('accept');
-
-                expect(controller.vnApp.showError).toHaveBeenCalledWith(`Choose a valid clients range`);
-            });
-
-            it('should make an http POST query and then call to the showSuccess() method', () => {
-                jest.spyOn(controller.vnApp, 'showSuccess');
-
-                const minShipped = Date.vnNew();
-                minShipped.setFullYear(minShipped.getFullYear() - 1);
-                minShipped.setMonth(1);
-                minShipped.setDate(1);
-                minShipped.setHours(0, 0, 0, 0);
-                controller.invoice = {
-                    invoiceDate: Date.vnNew(),
-                    maxShipped: Date.vnNew(),
-                    fromClientId: 1101,
-                    toClientId: 1101,
-                    companyFk: 442,
-                    minShipped: minShipped
-                };
-                const response = {
-                    clientsAndAddresses: [{clientId: 1101, addressId: 121}],
-                    invoice: controller.invoice
-                };
-
-                $httpBackend.expect('POST', `InvoiceOuts/clientsToInvoice`).respond(response);
-                $httpBackend.expect('POST', `InvoiceOuts/invoiceClient`).respond({id: 1});
-                controller.responseHandler('accept');
-                $httpBackend.flush();
-
-                expect(controller.vnApp.showSuccess).toHaveBeenCalled();
-            });
-        });
-    });
-});

modules/invoiceOut/front/index/global-invoicing/locale/es.yml

@@ -1,14 +0,0 @@
-Create global invoice: Crear factura global
-Some fields are required: Algunos campos son obligatorios
-Max date: Fecha límite
-Adding invoices to queue...: Añadiendo facturas a la cola...
-Invoice date: Fecha de factura
-From client: Desde el cliente
-To client: Hasta el cliente
-Invoice date and the max date should be filled: La fecha de factura y la fecha límite deben rellenarse
-Choose a valid clients range: Selecciona un rango válido de clientes
-of: de
-Id Client: Id Cliente
-All clients: Todos los clientes
-Clients range: Rango de clientes
-Calculating packages to invoice...: Calculando paquetes a factura...

modules/invoiceOut/front/index/global-invoicing/style.scss

@@ -1,17 +0,0 @@
-@import "variables";
-
-.vn-invoice-out-global-invoicing {
-    tpl-body {
-        width: 500px;
-
-        .progress {
-            font-weight: bold;
-            text-align: center;
-            font-size: 1.5rem;
-            color: $color-primary;
-            vn-horizontal {
-                justify-content: center
-            }
-        }
-    }
-}

modules/invoiceOut/front/index/index.html

@@ -18,7 +18,7 @@
         <vn-thead>
             <vn-tr>
                 <vn-th shrink>
-                    <vn-multi-check 
+                    <vn-multi-check
                         model="model">
                     </vn-multi-check>
                 </vn-th>
@@ -37,7 +37,7 @@
                 class="clickable vn-tr search-result"
                 ui-sref="invoiceOut.card.summary({id: {{::invoiceOut.id}}})">
                 <vn-td>
-                    <vn-check 
+                    <vn-check
                         ng-model="invoiceOut.checked"
                         vn-click-stop>
                     </vn-check>
@@ -68,29 +68,13 @@
     </vn-card>
 </vn-data-viewer>
 <div fixed-bottom-right>
-    <vn-vertical style="align-items: center;">
-        <vn-button class="round sm vn-mb-sm"
-            icon="add"
-            ng-click="invoicingOptions.show($event)"
-            vn-tooltip="Make invoice..."
-            tooltip-position="left"
-            vn-acl="invoicing"
-            vn-acl-action="remove">
-        </vn-button>
-
-        <vn-menu vn-id="invoicingOptions">
-            <vn-item translate
-                name="manualInvoice"
-                ng-click="manualInvoicing.show()">
-                Manual invoicing
-            </vn-item>
-            <vn-item translate
-                name="globalInvoice"
-                ng-click="globalInvoicing.show()">
-                Global invoicing
-            </vn-item>
-        </vn-menu>
-    </vn-vertical>
+    <vn-button class="round sm vn-mb-sm"
+        icon="add"
+        ng-click="manualInvoicing.show()"
+        vn-tooltip="Make invoice..."
+        vn-acl="invoicing"
+        vn-acl-action="remove">
+    </vn-button>
 </div>
 <vn-popup vn-id="summary">
     <vn-invoice-out-summary
@@ -103,7 +87,3 @@
 <vn-invoice-out-manual
     vn-id="manual-invoicing">
 </vn-invoice-out-manual>
-<vn-invoice-out-global-invoicing
-    vn-id="global-invoicing"
-    company-fk="$ctrl.vnConfig.companyFk">
-</vn-invoice-out-global-invoicing>

modules/invoiceOut/front/index/manual/index.html

@@ -14,11 +14,11 @@
         data="taxAreas"
         order="code">
     </vn-crud-model>
-    <div 
-        class="progress vn-my-md" 
+    <div
+        class="progress vn-my-md"
         ng-if="$ctrl.isInvoicing">
         <vn-horizontal>
-            <vn-icon vn-none icon="warning"></vn-icon> 
+            <vn-icon vn-none icon="warning"></vn-icon>
             <span vn-none translate>Invoicing in progress...</span>
         </vn-horizontal>
     </div>
@@ -80,4 +80,4 @@
 <tpl-buttons>
     <input type="button" response="cancel" translate-attr="{value: 'Cancel'}"/>
     <button response="accept" translate vn-focus>Make invoice</button>
-</tpl-buttons>
+</tpl-buttons>

modules/invoiceOut/front/index/manual/style.scss

@@ -14,4 +14,4 @@
             }
         }
     }
-}
+}

modules/invoiceOut/front/routes.json

@@ -6,7 +6,9 @@
     "dependencies": ["worker", "client", "ticket"],
     "menus": {
         "main": [
-            {"state": "invoiceOut.index", "icon": "icon-invoice-out"}
+            {"state": "invoiceOut.index", "icon": "icon-invoice-out"},
+            {"state": "invoiceOut.global-invoicing", "icon": "contact_support"}
+
         ]
     },
     "routes": [
@@ -24,6 +26,12 @@
             "component": "vn-invoice-out-index",
             "description": "InvoiceOut"
         },
+        {
+            "url": "/global-invoicing?q",
+            "state": "invoiceOut.global-invoicing",
+            "component": "vn-invoice-out-global-invoicing",
+            "description": "Global invoicing"
+        },
         {
             "url": "/summary",
             "state": "invoiceOut.card.summary",
@@ -40,4 +48,4 @@
             "component": "vn-invoice-out-card"
         }
     ]
-}
+}

modules/item/back/methods/item-image-queue/download.js

@@ -0,0 +1,191 @@
+const axios = require('axios');
+const uuid = require('uuid');
+const fs = require('fs/promises');
+const { createWriteStream } = require('fs');
+const path = require('path');
+const gm = require('gm');
+
+module.exports = Self => {
+    Self.remoteMethod('download', {
+        description: 'Processes the image download queue',
+        accessType: 'WRITE',
+        http: {
+            path: `/download`,
+            verb: 'POST',
+        },
+    });
+
+    Self.download = async () => {
+        const models = Self.app.models;
+        const tempContainer = await models.TempContainer.container(
+            'salix-image'
+        );
+        const tempPath = path.join(
+            tempContainer.client.root,
+            tempContainer.name
+        );
+        const maxAttempts = 3;
+        const collectionName = 'catalog';
+
+        const tx = await Self.beginTransaction({});
+
+        let tempFilePath;
+        let queueRow;
+        try {
+            const myOptions = { transaction: tx };
+
+            queueRow = await Self.findOne(
+                {
+                    fields: ['id', 'itemFk', 'url', 'attempts'],
+                    where: {
+                        url: { neq: null },
+                        attempts: {
+                            lt: maxAttempts,
+                        },
+                    },
+                    order: 'priority, attempts, updated',
+                },
+                myOptions
+            );
+
+            if (!queueRow) return;
+
+            const collection = await models.ImageCollection.findOne(
+                {
+                    fields: [
+                        'id',
+                        'maxWidth',
+                        'maxHeight',
+                        'model',
+                        'property',
+                    ],
+                    where: { name: collectionName },
+                    include: {
+                        relation: 'sizes',
+                        scope: {
+                            fields: ['width', 'height', 'crop'],
+                        },
+                    },
+                },
+                myOptions
+            );
+
+            const fileName = `${uuid.v4()}.png`;
+            tempFilePath = path.join(tempPath, fileName);
+
+            // Insert image row
+            await models.Image.create(
+                {
+                    name: fileName,
+                    collectionFk: collectionName,
+                    updated: Date.vnNow(),
+                },
+                myOptions
+            );
+
+            // Update item
+            const model = models[collection.model];
+            if (!model) throw new Error('No matching model found');
+
+            const item = await model.findById(queueRow.itemFk, null, myOptions);
+            if (item) {
+                await item.updateAttribute(
+                    collection.property,
+                    fileName,
+                    myOptions
+                );
+            }
+
+            // Download remote image
+            const response = await axios.get(queueRow.url, {
+                responseType: 'stream',
+            });
+
+            const writeStream = createWriteStream(tempFilePath);
+            await new Promise((resolve, reject) => {
+                writeStream.on('open', () => response.data.pipe(writeStream));
+                writeStream.on('finish', () => resolve());
+                writeStream.on('error', error => reject(error));
+            });
+
+            // Resize
+            const container = await models.ImageContainer.container(
+                collectionName
+            );
+            const rootPath = container.client.root;
+            const collectionDir = path.join(rootPath, collectionName);
+
+            // To max size
+            const { maxWidth, maxHeight } = collection;
+            const fullSizePath = path.join(collectionDir, 'full');
+            const toFullSizePath = `${fullSizePath}/${fileName}`;
+
+            await fs.mkdir(fullSizePath, { recursive: true });
+            await new Promise((resolve, reject) => {
+                gm(tempFilePath)
+                    .resize(maxWidth, maxHeight, '>')
+                    .setFormat('png')
+                    .write(toFullSizePath, function (err) {
+                        if (err) reject(err);
+                        if (!err) resolve();
+                    });
+            });
+
+            // To collection sizes
+            for (const size of collection.sizes()) {
+                const { width, height } = size;
+
+                const sizePath = path.join(collectionDir, `${width}x${height}`);
+                const toSizePath = `${sizePath}/${fileName}`;
+
+                await fs.mkdir(sizePath, { recursive: true });
+                await new Promise((resolve, reject) => {
+                    const gmInstance = gm(tempFilePath);
+
+                    if (size.crop) {
+                        gmInstance
+                            .resize(width, height, '^')
+                            .gravity('Center')
+                            .crop(width, height);
+                    }
+
+                    if (!size.crop) gmInstance.resize(width, height, '>');
+
+                    gmInstance
+                        .setFormat('png')
+                        .write(toSizePath, function (err) {
+                            if (err) reject(err);
+                            if (!err) resolve();
+                        });
+                });
+            }
+
+            try {
+                await fs.unlink(tempFilePath);
+            } catch (error) { }
+
+            await queueRow.destroy(myOptions);
+
+            // Restart queue
+            Self.download();
+
+            await tx.commit();
+        } catch (error) {
+            await tx.rollback();
+
+            if (queueRow.attempts < maxAttempts) {
+                await queueRow.updateAttributes({
+                    error: error,
+                    attempts: queueRow.attempts + 1,
+                    updated: Date.vnNew(),
+                });
+            }
+
+            try {
+                await fs.unlink(tempFilePath);
+            } catch (error) { }
+
+            Self.download();
+        }
+    };
+};

modules/item/back/methods/item-image-queue/downloadImages.js

@@ -59,17 +59,10 @@ module.exports = Self => {
                 }
 
                 const writeStream = fs.createWriteStream(filePath);
-                writeStream.on('open', () => {
-                    response.pipe(writeStream);
-                });
-
-                writeStream.on('error', async error => {
-                    await errorHandler(image.itemFk, error, filePath);
-                });
-
-                writeStream.on('finish', async function() {
-                    writeStream.end();
-                });
+                writeStream.on('open', () => response.pipe(writeStream));
+                writeStream.on('error', async error =>
+                    await errorHandler(image.itemFk, error, filePath));
+                writeStream.on('finish', () => writeStream.end());
 
                 writeStream.on('close', async function() {
                     try {

modules/item/back/methods/item/labelPdf.js

@@ -1,5 +1,3 @@
-const {Report} = require('vn-print');
-
 module.exports = Self => {
     Self.remoteMethodCtx('labelPdf', {
         description: 'Returns the item label pdf',
@@ -56,17 +54,5 @@ module.exports = Self => {
         }
     });
 
-    Self.labelPdf = async(ctx, id) => {
-        const args = Object.assign({}, ctx.args);
-        const params = {lang: ctx.req.getLocale()};
-
-        delete args.ctx;
-        for (const param in args)
-            params[param] = args[param];
-
-        const report = new Report('item-label', params);
-        const stream = await report.toPdfStream();
-
-        return [stream, 'application/pdf', `filename="item-${id}.pdf"`];
-    };
+    Self.labelPdf = (ctx, id) => Self.printReport(ctx, id, 'item-label');
 };

modules/item/back/models/item-image-queue.js

@@ -1,3 +1,3 @@
 module.exports = Self => {
-    require('../methods/item-image-queue/downloadImages')(Self);
+    require('../methods/item-image-queue/download')(Self);
 };

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

@@ -1,5 +1,3 @@
-const {Email} = require('vn-print');
-
 module.exports = Self => {
     Self.remoteMethodCtx('driverRouteEmail', {
         description: 'Sends the driver route email with an attached PDF',
@@ -41,19 +39,5 @@ module.exports = Self => {
         }
     });
 
-    Self.driverRouteEmail = async ctx => {
-        const args = Object.assign({}, ctx.args);
-        const params = {
-            recipient: args.recipient,
-            lang: ctx.req.getLocale()
-        };
-
-        delete args.ctx;
-        for (const param in args)
-            params[param] = args[param];
-
-        const email = new Email('driver-route', params);
-
-        return email.send();
-    };
+    Self.driverRouteEmail = ctx => Self.sendTemplate(ctx, 'driver-route');
 };

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

@@ -1,5 +1,3 @@
-const {Report} = require('vn-print');
-
 module.exports = Self => {
     Self.remoteMethodCtx('driverRoutePdf', {
         description: 'Returns the driver route pdf',
@@ -39,17 +37,5 @@ module.exports = Self => {
         }
     });
 
-    Self.driverRoutePdf = async(ctx, id) => {
-        const args = Object.assign({}, ctx.args);
-        const params = {lang: ctx.req.getLocale()};
-
-        delete args.ctx;
-        for (const param in args)
-            params[param] = args[param];
-
-        const report = new Report('driver-route', params);
-        const stream = await report.toPdfStream();
-
-        return [stream, 'application/pdf', `filename="doc-${id}.pdf"`];
-    };
+    Self.driverRoutePdf = (ctx, id) => Self.printReport(ctx, id, 'driver-route');
 };

modules/supplier/back/methods/supplier/campaignMetricsPdf.js

@@ -1,5 +1,3 @@
-const {Report} = require('vn-print');
-
 module.exports = Self => {
     Self.remoteMethodCtx('campaignMetricsPdf', {
         description: 'Returns the campaign metrics pdf',
@@ -49,17 +47,5 @@ module.exports = Self => {
         }
     });
 
-    Self.campaignMetricsPdf = async(ctx, id) => {
-        const args = Object.assign({}, ctx.args);
-        const params = {lang: ctx.req.getLocale()};
-
-        delete args.ctx;
-        for (const param in args)
-            params[param] = args[param];
-
-        const report = new Report('supplier-campaign-metrics', params);
-        const stream = await report.toPdfStream();
-
-        return [stream, 'application/pdf', `filename="doc-${id}.pdf"`];
-    };
+    Self.campaignMetricsPdf = (ctx, id) => Self.printReport(ctx, id, 'supplier-campaign-metrics');
 };

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

@@ -1,5 +1,3 @@
-const {Report} = require('vn-print');
-
 module.exports = Self => {
     Self.remoteMethodCtx('collectionLabel', {
         description: 'Returns the collection label',
@@ -39,17 +37,5 @@ module.exports = Self => {
         }
     });
 
-    Self.collectionLabel = async(ctx, id) => {
-        const args = Object.assign({}, ctx.args);
-        const params = {lang: ctx.req.getLocale()};
-
-        delete args.ctx;
-        for (const param in args)
-            params[param] = args[param];
-
-        const report = new Report('collection-label', params);
-        const stream = await report.toPdfStream();
-
-        return [stream, 'application/pdf', `filename="doc-${id}.pdf"`];
-    };
+    Self.collectionLabel = (ctx, id) => Self.printReport(ctx, id, 'collection-label');
 };

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

@@ -1,5 +1,3 @@
-const {Email} = require('vn-print');
-
 module.exports = Self => {
     Self.remoteMethodCtx('deliveryNoteEmail', {
         description: 'Sends the delivery note email with an attached PDF',
@@ -47,19 +45,5 @@ module.exports = Self => {
         }
     });
 
-    Self.deliveryNoteEmail = async ctx => {
-        const args = Object.assign({}, ctx.args);
-        const params = {
-            recipient: args.recipient,
-            lang: ctx.req.getLocale()
-        };
-
-        delete args.ctx;
-        for (const param in args)
-            params[param] = args[param];
-
-        const email = new Email('delivery-note', params);
-
-        return email.send();
-    };
+    Self.deliveryNoteEmail = ctx => Self.sendTemplate(ctx, 'delivery-note');
 };

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

@@ -1,5 +1,3 @@
-const {Report} = require('vn-print');
-
 module.exports = Self => {
     Self.remoteMethodCtx('deliveryNotePdf', {
         description: 'Returns the delivery note pdf',
@@ -46,17 +44,5 @@ module.exports = Self => {
         }
     });
 
-    Self.deliveryNotePdf = async(ctx, id) => {
-        const args = Object.assign({}, ctx.args);
-        const params = {lang: ctx.req.getLocale()};
-
-        delete args.ctx;
-        for (const param in args)
-            params[param] = args[param];
-
-        const report = new Report('delivery-note', params);
-        const stream = await report.toPdfStream();
-
-        return [stream, 'application/pdf', `filename="doc-${id}.pdf"`];
-    };
+    Self.deliveryNotePdf = (ctx, id) => Self.printReport(ctx, id, 'delivery-note');
 };

modules/ticket/back/methods/ticket/expeditionPalletLabel.js

@@ -1,5 +1,3 @@
-const {Report} = require('vn-print');
-
 module.exports = Self => {
     Self.remoteMethodCtx('expeditionPalletLabel', {
         description: 'Returns the expedition pallet label',
@@ -39,17 +37,5 @@ module.exports = Self => {
         }
     });
 
-    Self.expeditionPalletLabel = async(ctx, id) => {
-        const args = Object.assign({}, ctx.args);
-        const params = {lang: ctx.req.getLocale()};
-
-        delete args.ctx;
-        for (const param in args)
-            params[param] = args[param];
-
-        const report = new Report('expedition-pallet-label', params);
-        const stream = await report.toPdfStream();
-
-        return [stream, 'application/pdf', `filename="doc-${id}.pdf"`];
-    };
+    Self.expeditionPalletLabel = (ctx, id) => Self.printReport(ctx, id, 'expedition-pallet-label');
 };

modules/ticket/front/sale-tracking/index.html

@@ -29,7 +29,7 @@
                         'pink': sale.preparingList.hasSaleGroupDetail,
                         'none': !sale.preparingList.hasSaleGroupDetail,
                     }"
-                    class="circle"
+                    class="circleState"
                     vn-tooltip="has saleGroupDetail"
                     >
                     </vn-chip>
@@ -37,28 +37,28 @@
                         'notice': sale.preparingList.isPreviousSelected,
                         'none': !sale.preparingList.isPreviousSelected,
                     }"
-                    class="circle"
+                    class="circleState"
                     vn-tooltip="is previousSelected">
                     </vn-chip>
                     <vn-chip ng-class="::{
                         'dark-notice': sale.preparingList.isPrevious,
                         'none': !sale.preparingList.isPrevious,
                     }"
-                    class="circle"
+                    class="circleState"
                     vn-tooltip="is previous">
                     </vn-chip>
                     <vn-chip ng-class="::{
                         'warning': sale.preparingList.isPrepared,
                         'none': !sale.preparingList.isPrepared,
                     }"
-                    class="circle"
+                    class="circleState"
                     vn-tooltip="is prepared">
                     </vn-chip>
                     <vn-chip ng-class="::{
                         'yellow': sale.preparingList.isControled,
                         'none': !sale.preparingList.isControled,
                     }"
-                    class="circle"
+                    class="circleState"
                     vn-tooltip="is controled">
                     </vn-chip>
                     </vn-td>