db/routines/vn/procedures/invoiceOut_new.sql

@@ -68,16 +68,21 @@ BEGIN
 	DELETE ti.*
 		FROM tmp.ticketToInvoice ti
 			JOIN ticket t ON t.id = ti.id
+			LEFT JOIN address a ON a.id = t.addressFk
 			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
+			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;
+			OR itc.id IS NULL
+			OR a.id IS NULL 
+			OR (vTaxArea = 'WORLD' 
+				AND (a.customsAgentFk IS NULL OR a.incotermsFk IS NULL));
 
 	SELECT SUM(s.quantity * s.price * (100 - s.discount)/100) <> 0
 		INTO vIsAnySaleToInvoice

db/versions/10949-limeLaurel/00-firstScript.sql

@@ -0,0 +1,15 @@
+	INSERT INTO util.notification ( name, description)
+		SELECT  'invoice-ticket-closure',
+				'Tickets not invoiced during the nightly closure ticket process';
+			
+	SET @notificationFk =LAST_INSERT_ID();
+
+	INSERT IGNORE INTO util.notificationAcl (notificationFk, roleFk)
+		SELECT  @notificationFk,id 
+			FROM account.role 
+			WHERE name ='administrative';
+
+	INSERT IGNORE INTO util.notificationSubscription (notificationFk, userFk)
+		SELECT @notificationFk, id 
+			FROM account.`user`
+			WHERE `name` = 'admon';

modules/ticket/back/methods/ticket/closeAll.js

@@ -53,8 +53,8 @@ module.exports = Self => {
                     JOIN province p ON p.id = c.provinceFk
                     JOIN country co ON co.id = p.countryFk
                     LEFT JOIN account.emailUser eu ON eu.userFk = c.salesPersonFk
-                WHERE (al.code = 'PACKED' OR (am.code = 'refund' AND al.code != 'delivered'))
+                WHERE (al.code = 'PACKED' OR (am.code = 'refund' AND al.code <> 'delivered'))
-                    AND DATE(t.shipped) BETWEEN DATE_ADD(?, INTERVAL -2 DAY) AND util.dayEnd(?)
+                    AND DATE(t.shipped) BETWEEN ? - INTERVAL 2 DAY AND util.dayEnd(?)
                     AND t.refFk IS NULL
                 GROUP BY t.id
         `, [toDate, toDate]);
@@ -64,18 +64,83 @@ module.exports = Self => {
                 VALUES ('nightInvoicing', ?)
         `, [ticketIds.join(',')]);
 
+        await Self.rawSql(`
+        WITH ticketNotInvoiceable AS(
+            SELECT JSON_OBJECT(
+                'tickets',
+                JSON_ARRAYAGG(
+                    JSON_OBJECT(
+                        'ticketId', ticketFk,
+                        'reason', reason
+                    )
+                )
+            )errors
+            FROM (
+                SELECT ticketFk,
+                        CONCAT_WS(', ',
+                            IF(hasErrorToInvoice, 'Facturar', NULL),
+                            IF(hasErrorTaxDataChecked, 'Datos comprobados', NULL),
+                            IF(hasErrorDeleted, 'Eliminado', NULL),
+                            IF(hasErrorItemTaxCountry, 'Impuesto no informado', NULL),
+                            IF(hasErrorAddress, 'Sin dirección', NULL),
+                            IF(hasErrorInfoTaxAreaWorld, 'Datos exportaciones', NULL)) reason
+                    FROM (
+                        SELECT t.id ticketFk,
+                                SUM(NOT c.hasToInvoice) hasErrorToInvoice,
+                                SUM(NOT c.isTaxDataChecked) hasErrorTaxDataChecked,
+                                SUM(t.isDeleted) hasErrorDeleted,
+                                SUM(itc.id IS NULL) hasErrorItemTaxCountry,
+                                SUM(a.id IS NULL) hasErrorAddress,
+                                SUM(ios.code IS NOT NULL 
+                                    AND(ad.customsAgentFk IS NULL 
+                                        OR ad.incotermsFk IS NULL)) hasErrorInfoTaxAreaWorld
+                            FROM ticket t
+                                LEFT JOIN address ad ON ad.id = t.addressFk
+                                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 agencyMode am ON am.id = t.agencyModeFk
+                                JOIN warehouse wh ON wh.id = t.warehouseFk AND wh.hasComission
+                                JOIN ticketState ts ON ts.ticketFk = t.id
+                                JOIN alertLevel al ON al.id = ts.alertLevel
+                                JOIN client c ON c.id = t.clientFk
+                                JOIN province p ON p.id = c.provinceFk
+                                LEFT JOIN autonomy a ON a.id = p.autonomyFk
+                                JOIN country co ON co.id = p.countryFk
+                                LEFT JOIN account.emailUser eu ON eu.userFk = c.salesPersonFk
+                                LEFT JOIN itemTaxCountry itc ON itc.itemFk = i.id
+                                    AND itc.countryFk = su.countryFk
+                                LEFT JOIN vn.invoiceOutSerial ios ON ios.taxAreaFk = 'WORLD' 
+                                    AND ios.code = invoiceSerial(t.clientFk, t.companyFk, 'M')
+                            WHERE (al.code = 'PACKED' OR (am.code = 'refund' AND al.code <> 'delivered'))
+                                AND DATE(t.shipped) BETWEEN ? - INTERVAL 2 DAY AND util.dayEnd(?)
+                                AND t.refFk IS NULL
+                                AND IFNULL(a.hasDailyInvoice, co.hasDailyInvoice)
+                            GROUP BY ticketFk   
+                            HAVING hasErrorToInvoice 
+                                OR hasErrorTaxDataChecked 
+                                OR hasErrorDeleted 
+                                OR hasErrorItemTaxCountry 
+                                OR hasErrorAddress 
+                                OR hasErrorInfoTaxAreaWorld
+                    )sub
+                )sub2
+            ) SELECT IF(errors = '{"tickets": null}',
+                    'No errors',
+                    util.notification_send('invoice-ticket-closure', errors, NULL)) 
+                FROM ticketNotInvoiceable`, [toDate, toDate]);
+
         await closure(ctx, Self, tickets);
 
         await Self.rawSql(`
             UPDATE ticket t
-                JOIN ticketState ts ON t.id = ts.ticketFk
+                    JOIN ticketState ts ON t.id = ts.ticketFk
-                JOIN alertLevel al ON al.id = ts.alertLevel
+                    JOIN alertLevel al ON al.id = ts.alertLevel
-                JOIN agencyMode am ON am.id = t.agencyModeFk
+                    JOIN agencyMode am ON am.id = t.agencyModeFk
-                JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk
+                    JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk
-                JOIN zone z ON z.id = t.zoneFk
+                    JOIN zone z ON z.id = t.zoneFk
-            SET t.routeFk = NULL
+                SET t.routeFk = NULL
-                WHERE DATE(t.shipped) BETWEEN DATE_ADD(?, INTERVAL -2 DAY)
+                WHERE DATE(t.shipped) BETWEEN ? - INTERVAL 2 DAY AND util.dayEnd(?)
-                    AND util.dayEnd(?)
                     AND al.code NOT IN('DELIVERED','PACKED')
                     AND t.routeFk
                     AND z.name LIKE '%MADRID%'`, [toDate, toDate], {userId: ctx.req.accessToken.userId});

print/templates/email/invoice-ticket-closure/assets/css/import.js

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

print/templates/email/invoice-ticket-closure/invoice-ticket-closure.html

@@ -0,0 +1,13 @@
+<email-body v-bind="$props">
+    <div class="grid-row">
+        <div class="grid-block vn-px-ml centered">
+            <h1>{{ $t('title') }}</h1>
+            <hr>
+        </div>
+        <div v-for="ticket in tickets" class="grid-block vn-px-ml">
+            <p v-if="ticket.ticketId"><b>{{ $t('ticketId') }}:</b> {{ticket.ticketId}}</p>
+            <p v-if="ticket.reason"><b>{{ $t('reason') }}:</b> {{ticket.reason}}</p>
+            <hr>
+        </div>
+    </div>
+</email-body>

print/templates/email/invoice-ticket-closure/invoice-ticket-closure.js

@@ -0,0 +1,15 @@
+const Component = require(`vn-print/core/component`);
+const emailBody = new Component('email-body');
+
+module.exports = {
+    name: 'invoice-ticket-closure',
+    components: {
+        'email-body': emailBody.build(),
+    },
+    props: {
+        tickets: {
+            type: Array,
+            required: true
+        },
+    }
+};

print/templates/email/invoice-ticket-closure/locale/en.yml

@@ -0,0 +1,4 @@
+subject: Nightly ticket closing process report
+title: Nightly ticket closing process report
+reason: Reason
+ticketId: Ticket 

print/templates/email/invoice-ticket-closure/locale/es.yml

@@ -0,0 +1,4 @@
+subject: Informe proceso de cierre de tickets nocturno
+title: Informe proceso de cierre de tickets nocturno
+reason: Motivo
+ticketId: Ticket