diff --git a/db/changes/10503-november/00-timeBusiness_calculate.sql b/db/changes/10503-november/00-timeBusiness_calculate.sql
new file mode 100644
index 000000000..ea13c4a8a
--- /dev/null
+++ b/db/changes/10503-november/00-timeBusiness_calculate.sql
@@ -0,0 +1,88 @@
+DROP PROCEDURE IF EXISTS `vn`.`timeBusiness_calculate`;
+
+DELIMITER $$
+$$
+CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`timeBusiness_calculate`(vDatedFrom DATETIME, vDatedTo DATETIME)
+BEGIN
+/**
+ * Horas que debe trabajar un empleado según contrato y día.
+ * @param vDatedFrom workerTimeControl
+ * @param vDatedTo workerTimeControl
+ * @table tmp.user(userFk)
+ * @return tmp.timeBusinessCalculate
+ */
+ DROP TEMPORARY TABLE IF EXISTS tmp.timeBusinessCalculate;
+ CREATE TEMPORARY TABLE tmp.timeBusinessCalculate
+ (INDEX (departmentFk))
+ SELECT dated,
+ businessFk,
+ userFk,
+ departmentFk,
+ hourStart,
+ hourEnd,
+ timeTable,
+ timeWorkSeconds,
+ SEC_TO_TIME(timeWorkSeconds) timeWorkSexagesimal,
+ timeWorkSeconds / 3600 timeWorkDecimal,
+ timeWorkSeconds timeBusinessSeconds,
+ SEC_TO_TIME(timeWorkSeconds) timeBusinessSexagesimal,
+ timeWorkSeconds / 3600 timeBusinessDecimal,
+ name type,
+ permissionRate,
+ hoursWeek,
+ discountRate,
+ isAllowedToWork
+ FROM(SELECT t.dated,
+ b.id businessFk,
+ w.userFk,
+ b.departmentFk,
+ IF(j.start = NULL, NULL, GROUP_CONCAT(DISTINCT LEFT(j.start,5) ORDER BY j.start ASC SEPARATOR ' - ')) hourStart ,
+ IF(j.start = NULL, NULL, GROUP_CONCAT(DISTINCT LEFT(j.end,5) ORDER BY j.end ASC SEPARATOR ' - ')) hourEnd,
+ IF(j.start = NULL, NULL, GROUP_CONCAT(DISTINCT LEFT(j.start,5), " - ", LEFT(j.end,5) ORDER BY j.end ASC SEPARATOR ' - ')) timeTable,
+ IF(j.start = NULL, 0, IFNULL(SUM(TIME_TO_SEC(j.end)) - SUM(TIME_TO_SEC(j.start)), 0)) timeWorkSeconds,
+ at2.name,
+ at2.permissionRate,
+ at2.discountRate,
+ cl.hours_week hoursWeek,
+ at2.isAllowedToWork
+ FROM time t
+ LEFT JOIN business b ON t.dated BETWEEN b.started AND IFNULL(b.ended, vDatedTo)
+ LEFT JOIN worker w ON w.id = b.workerFk
+ JOIN tmp.`user` u ON u.userFK = w.userFK
+ LEFT JOIN workCenter wc ON wc.id = b.workcenterFK
+ LEFT JOIN postgresql.calendar_labour_type cl ON cl.calendar_labour_type_id = b.calendarTypeFk
+ LEFT JOIN postgresql.journey j ON j.business_id = b.id AND j.day_id = WEEKDAY(t.dated) + 1
+ LEFT JOIN postgresql.calendar_employee ce ON ce.businessFk = b.id AND ce.date = t.dated
+ LEFT JOIN absenceType at2 ON at2.id = ce.calendar_state_id
+ WHERE t.dated BETWEEN vDatedFrom AND vDatedTo
+ GROUP BY w.userFk, t.dated
+ )sub;
+
+ UPDATE tmp.timeBusinessCalculate t
+ LEFT JOIN postgresql.journey j ON j.business_id = t.businessFk
+ SET t.timeWorkSeconds = t.hoursWeek / 5 * 3600,
+ t.timeWorkSexagesimal = SEC_TO_TIME( t.hoursWeek / 5 * 3600),
+ t.timeWorkDecimal = t.hoursWeek / 5,
+ t.timeBusinessSeconds = t.hoursWeek / 5 * 3600,
+ t.timeBusinessSexagesimal = SEC_TO_TIME( t.hoursWeek / 5 * 3600),
+ t.timeBusinessDecimal = t.hoursWeek / 5
+ WHERE DAYOFWEEK(t.dated) IN(2,3,4,5,6) AND j.journey_id IS NULL ;
+
+ UPDATE tmp.timeBusinessCalculate t
+ SET t.timeWorkSeconds = t.timeWorkSeconds - (t.timeWorkSeconds * permissionRate) ,
+ t.timeWorkSexagesimal = SEC_TO_TIME ((t.timeWorkDecimal - (t.timeWorkDecimal * permissionRate)) * 3600),
+ t.timeWorkDecimal = t.timeWorkDecimal - (t.timeWorkDecimal * permissionRate)
+ WHERE permissionRate <> 0;
+
+ UPDATE tmp.timeBusinessCalculate t
+ JOIN calendarHolidays ch ON ch.dated = t.dated
+ JOIN business b ON b.id = t.businessFk
+ AND b.workcenterFk = ch.workcenterFk
+ SET t.timeWorkSeconds = 0,
+ t.timeWorkSexagesimal = 0,
+ t.timeWorkDecimal = 0,
+ t.permissionrate = 1,
+ t.type = 'Festivo'
+ WHERE t.type IS NULL;
+END$$
+DELIMITER ;
diff --git a/modules/client/back/methods/client/setPassword.js b/modules/client/back/methods/client/setPassword.js
index 2f0ebca5b..e3fc9bbf8 100644
--- a/modules/client/back/methods/client/setPassword.js
+++ b/modules/client/back/methods/client/setPassword.js
@@ -23,12 +23,6 @@ module.exports = Self => {
Self.setPassword = async function(ctx, id, newPassword) {
const models = Self.app.models;
- const userId = ctx.req.accessToken.userId;
-
- const isSalesPerson = await models.Account.hasRole(userId, 'salesPerson');
-
- if (!isSalesPerson)
- throw new UserError(`Not enough privileges to edit a client`);
const isClient = await models.Client.findById(id, null);
const isUserAccount = await models.UserAccount.findById(id, null);
diff --git a/modules/client/back/methods/client/specs/setPassword.spec.js b/modules/client/back/methods/client/specs/setPassword.spec.js
index 13065ca12..03334918b 100644
--- a/modules/client/back/methods/client/specs/setPassword.spec.js
+++ b/modules/client/back/methods/client/specs/setPassword.spec.js
@@ -6,21 +6,6 @@ describe('Client setPassword', () => {
req: {accessToken: {userId: salesPersonId}}
};
- it(`should throw an error if you don't have enough permissions`, async() => {
- let error;
- const employeeId = 1;
- const ctx = {
- req: {accessToken: {userId: employeeId}}
- };
- try {
- await models.Client.setPassword(ctx, 1, 't0pl3v3l.p455w0rd!');
- } catch (e) {
- error = e;
- }
-
- expect(error.message).toEqual(`Not enough privileges to edit a client`);
- });
-
it('should throw an error the setPassword target is not just a client but a worker', async() => {
let error;
diff --git a/modules/monitor/back/methods/sales-monitor/ordersFilter.js b/modules/monitor/back/methods/sales-monitor/ordersFilter.js
index 6ae4042b6..a80ea822e 100644
--- a/modules/monitor/back/methods/sales-monitor/ordersFilter.js
+++ b/modules/monitor/back/methods/sales-monitor/ordersFilter.js
@@ -53,7 +53,7 @@ module.exports = Self => {
JOIN client c ON c.id = o.customer_id
JOIN address a ON a.id = o.address_id
JOIN agencyMode am ON am.id = o.agency_id
- JOIN user u ON u.id = c.salesPersonFk
+ JOIN account.user u ON u.id = c.salesPersonFk
JOIN workerTeamCollegues wtc ON c.salesPersonFk = wtc.collegueFk`);
if (!filter.where) filter.where = {};
diff --git a/modules/ticket/front/sale/index.js b/modules/ticket/front/sale/index.js
index 85a862bbb..f64d0b61b 100644
--- a/modules/ticket/front/sale/index.js
+++ b/modules/ticket/front/sale/index.js
@@ -89,7 +89,7 @@ class Controller extends Section {
getUsesMana() {
this.$http.get(`Sales/usesMana`)
.then(res => {
- this.useMana = res.data;
+ this.usesMana = res.data;
});
}
diff --git a/modules/worker/back/methods/worker-time-control/specs/sendMail.spec.js b/modules/worker/back/methods/worker-time-control/specs/sendMail.spec.js
index d0afd45b9..4cc6e54e3 100644
--- a/modules/worker/back/methods/worker-time-control/specs/sendMail.spec.js
+++ b/modules/worker/back/methods/worker-time-control/specs/sendMail.spec.js
@@ -12,11 +12,6 @@ describe('workerTimeControl sendMail()', () => {
};
- beforeAll(function() {
- originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
- jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000;
- });
-
it('should fill time control of a worker without records in Journey and with rest', async() => {
const tx = await models.WorkerTimeControl.beginTransaction({});
@@ -124,9 +119,5 @@ describe('workerTimeControl sendMail()', () => {
throw e;
}
});
-
- afterAll(function() {
- jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
- });
});
diff --git a/print/templates/email/client-welcome/client-welcome.html b/print/templates/email/client-welcome/client-welcome.html
index acd49dc87..3554b6e92 100644
--- a/print/templates/email/client-welcome/client-welcome.html
+++ b/print/templates/email/client-welcome/client-welcome.html
@@ -9,7 +9,7 @@
{{$t('clientId')}}: {{client.id}}
{{$t('user')}}: {{client.userName}}
@@ -53,4 +53,4 @@
-
\ No newline at end of file
+
diff --git a/print/templates/email/client-welcome/locale/es.yml b/print/templates/email/client-welcome/locale/es.yml
index 1257113ac..478fd242c 100644
--- a/print/templates/email/client-welcome/locale/es.yml
+++ b/print/templates/email/client-welcome/locale/es.yml
@@ -1,8 +1,8 @@
subject: Bienvenido a Verdnatura
title: "¡Te damos la bienvenida!"
dearClient: Estimado cliente
-clientData: 'Tus datos para poder comprar en la web de Verdnatura (https://verdnatura.es)
+clientData: 'Tus datos para poder comprar en la web de Verdnatura (https://shop.verdnatura.es)
o en nuestras aplicaciones para iOS y Android, son'
diff --git a/print/templates/email/vehicle-event-expired/assets/css/import.js b/print/templates/email/vehicle-event-expired/assets/css/import.js
new file mode 100644
index 000000000..4b4bb7086
--- /dev/null
+++ b/print/templates/email/vehicle-event-expired/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();
diff --git a/print/templates/email/vehicle-event-expired/attachments.json b/print/templates/email/vehicle-event-expired/attachments.json
new file mode 100644
index 000000000..6b56392a0
--- /dev/null
+++ b/print/templates/email/vehicle-event-expired/attachments.json
@@ -0,0 +1,6 @@
+[
+ {
+ "filename": "vehicle-event-expired.pdf",
+ "component": "vehicle-event-expired"
+ }
+]
diff --git a/print/templates/email/vehicle-event-expired/locale/es.yml b/print/templates/email/vehicle-event-expired/locale/es.yml
new file mode 100644
index 000000000..f6fff468c
--- /dev/null
+++ b/print/templates/email/vehicle-event-expired/locale/es.yml
@@ -0,0 +1,3 @@
+subject: Expiración Tarjetas Vehículos
+title: Expiración Tarjetas Vehículos
+description: A continuación se adjunta el informe de expiración de tarjetas vehículos
diff --git a/print/templates/email/vehicle-event-expired/vehicle-event-expired.html b/print/templates/email/vehicle-event-expired/vehicle-event-expired.html
new file mode 100644
index 000000000..f4c1ebc1b
--- /dev/null
+++ b/print/templates/email/vehicle-event-expired/vehicle-event-expired.html
@@ -0,0 +1,8 @@
+
+
+
diff --git a/print/templates/email/vehicle-event-expired/vehicle-event-expired.js b/print/templates/email/vehicle-event-expired/vehicle-event-expired.js
new file mode 100755
index 000000000..1c228d2b5
--- /dev/null
+++ b/print/templates/email/vehicle-event-expired/vehicle-event-expired.js
@@ -0,0 +1,9 @@
+const Component = require(`vn-print/core/component`);
+const emailBody = new Component('email-body');
+
+module.exports = {
+ name: 'vehicle-event-expired',
+ components: {
+ 'email-body': emailBody.build()
+ }
+};
diff --git a/print/templates/reports/vehicle-event-expired/assets/css/import.js b/print/templates/reports/vehicle-event-expired/assets/css/import.js
index fd8796c2b..37a98dfdd 100644
--- a/print/templates/reports/vehicle-event-expired/assets/css/import.js
+++ b/print/templates/reports/vehicle-event-expired/assets/css/import.js
@@ -1,9 +1,12 @@
-const Stylesheet = require(`${appPath}/core/stylesheet`);
+const Stylesheet = require(`vn-print/core/stylesheet`);
+
+const path = require('path');
+const vnPrintPath = path.resolve('print');
module.exports = new Stylesheet([
- `${appPath}/common/css/spacing.css`,
- `${appPath}/common/css/misc.css`,
- `${appPath}/common/css/layout.css`,
- `${appPath}/common/css/report.css`,
+ `${vnPrintPath}/common/css/spacing.css`,
+ `${vnPrintPath}/common/css/misc.css`,
+ `${vnPrintPath}/common/css/layout.css`,
+ `${vnPrintPath}/common/css/report.css`,
`${__dirname}/style.css`])
.mergeStyles();
diff --git a/print/templates/reports/vehicle-event-expired/vehicle-event-expired.js b/print/templates/reports/vehicle-event-expired/vehicle-event-expired.js
index 278caeabf..ab6cffc00 100755
--- a/print/templates/reports/vehicle-event-expired/vehicle-event-expired.js
+++ b/print/templates/reports/vehicle-event-expired/vehicle-event-expired.js
@@ -1,4 +1,4 @@
-const Component = require(`${appPath}/core/component`);
+const Component = require(`vn-print/core/component`);
const reportBody = new Component('report-body');
module.exports = {
diff --git a/print/templates/reports/zone/zone.js b/print/templates/reports/zone/zone.js
index 463c28acf..720542cd6 100755
--- a/print/templates/reports/zone/zone.js
+++ b/print/templates/reports/zone/zone.js
@@ -1,4 +1,4 @@
-const Component = require(`${appPath}/core/component`);
+const Component = require(`vn-print/core/component`);
const reportBody = new Component('report-body');
module.exports = {