Merge branch 'dev' into 8227-roadmap

db/dump/fixtures.before.sql

@@ -2924,7 +2924,8 @@ INSERT INTO `util`.`notification` (`id`, `name`, `description`)
         (7, 'zone-included','An email to notify zoneCollisions'),
         (8, 'backup-printer-selected','A backup printer has been selected'),
         (9, 'mrw-deadline','The MRW deadline has passed'),
-        (10,'invoice-ticket-closure','Tickets not invoiced during the nightly closure ticket process');
+        (10,'invoice-ticket-closure','Tickets not invoiced during the nightly closure ticket process'),
+        (11,'misallocation-warehouse','Misallocation of items in the warehouse.');
 
 TRUNCATE `util`.`notificationAcl`;
 INSERT INTO `util`.`notificationAcl` (`notificationFk`, `roleFk`)
@@ -2938,7 +2939,8 @@ INSERT INTO `util`.`notificationAcl` (`notificationFk`, `roleFk`)
         (6, 9),
         (7, 9),
         (8, 66),
-        (9, 56);
+        (9, 56),
+		(11, 9);
 
 TRUNCATE `util`.`notificationQueue`;
 INSERT INTO `util`.`notificationQueue` (`id`, `notificationFk`, `params`, `authorFk`, `status`, `created`)

db/versions/11430-salmonRaphis/00-firstScript.sql

@@ -0,0 +1,5 @@
+
+
+INSERT IGNORE INTO util.notification
+    SET name = 'misallocation-warehouse',
+        description = 'Misallocation in warehouse';

loopback/locale/es.json

@@ -395,6 +395,6 @@
     "All tickets have a route order": "Todos los tickets tienen orden de ruta",
     "There are tickets to be invoiced": "La zona tiene tickets por facturar",
     "Incorrect delivery order alert on route": "Alerta de orden de entrega incorrecta en ruta: {{ route }} zona: {{ zone }}",
-	"Ticket has been delivered out of order": "El ticket {{ticket}} {{{fullUrl}}} no ha sigo entregado en su orden.",
+    "Ticket has been delivered out of order": "El ticket {{ticket}} {{{fullUrl}}} no ha sido entregado en su orden.",
     "Price cannot be blank": "El precio no puede estar en blanco"
 }

print/templates/email/misallocation-warehouse/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/misallocation-warehouse/locale/en.yml

@@ -0,0 +1,3 @@
+subject: Misallocation of articles
+title: Misallocation of articles
+body: Misallocated articles have been placed in the warehouse that do not correspond to the entry location.

print/templates/email/misallocation-warehouse/locale/es.yml

@@ -0,0 +1,3 @@
+subject: Artículos mal ubicados
+title: Artículos mal ubicados
+body: Artículos mal ubicados han sido colocados en el almacén que no corresponden a la ubicación de la entrada.

print/templates/email/misallocation-warehouse/locale/fr.yml

@@ -0,0 +1,3 @@
+subject: Artículos mal placés
+title: Artículos mal placés
+body: Artículos mal placés ont été stockés dans l’entrepôt qui ne correspond pas à l’emplacement de l’entrée.

print/templates/email/misallocation-warehouse/locale/pt.yml

@@ -0,0 +1,3 @@
+subject: Artículos mal colocados
+title: Artículos mal colocados
+body: Artículos mal colocados foram armazenados no armazém que não corresponde à localização da entrada.

print/templates/email/misallocation-warehouse/misallocation-warehouse.html

@@ -0,0 +1,9 @@
+<email-body>
+    <div class="grid-row">
+        <div class="grid-block vn-pa-ml">
+            <h1>{{ $t('title') }}</h1>
+            <p>{{$t('body')}}</p>
+            <p>{{action}}</p>
+        </div>
+    </div>
+</email-body>

print/templates/email/misallocation-warehouse/misallocation-warehouse.js

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